commit 56b2981db544714de42c04f56403722f1f5be333
author Geremy Condra <gcondra@google.com> Fri Mar 22 18:29:06 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Mar 22 18:29:06 2013 -0700
tree 59b22d3774c64915fafe4e0e1e28b5759c5d3628
parent b035d80cedf3ce9e066175a92ecae68a6b200d73
parent eee138c2db6916a2b965819b1c25f10c490c329a

am eee138c2: Merge "Allow zygote to search tmpfs."

* commit 'eee138c2db6916a2b965819b1c25f10c490c329a':
  Allow zygote to search tmpfs.

bluetooth.te

diff --git a/bluetooth.te b/bluetooth.te
index cd17967..452c323 100644
--- a/bluetooth.te
+++ b/bluetooth.te
@@ -10,7 +10,7 @@
 r_dir_file(bluetooth, bluetooth_efs_file)
 
 # Device accesses.
-allow bluetooth { tun_device uhid_device hci_attach_dev }:chr_file rw_file_perms;
+allow bluetooth { hci_attach_dev }:chr_file rw_file_perms;
 allow bluetooth input_device:chr_file write;
 
 # sysfs access.

file_contexts

diff --git a/file_contexts b/file_contexts
index 00a79b2..ba575c3 100644
--- a/file_contexts
+++ b/file_contexts
@@ -144,6 +144,11 @@
 /system/xbin/su		u:object_r:su_exec:s0
 /system/vendor/bin/gpsd u:object_r:gpsd_exec:s0
 #############################
+# Vendor files
+#
+/vendor(/.*)?		u:object_r:system_file:s0
+/vendor/bin/gpsd	u:object_r:gpsd_exec:s0
+#############################
 # Data files
 #
 /data(/.*)?		u:object_r:system_data_file:s0