commit d0d06251b97da1d967b42d71750f12c68eb3f157
author Geremy Condra <gcondra@google.com> Tue Mar 26 16:51:13 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Mar 26 16:51:13 2013 -0700
tree 601ad09fdddfe79a2329591cf0461500b5265521
parent 32866846e41d1a5d2dee092fe726f7bac8312cc1
parent bf539bf363c0361e3bac8ffd5e15c7ec8c514fdb

am bf539bf3: Merge "Fix makefile error with ANDROID_BUILD_TOP"

* commit 'bf539bf363c0361e3bac8ffd5e15c7ec8c514fdb':
  Fix makefile error with ANDROID_BUILD_TOP

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 6501dfd..64e2ca8 100644
--- a/file_contexts
+++ b/file_contexts
@@ -146,6 +146,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