commit 7c8e6d4a962a5a10dfb32dcd4cbb33d29881d07d
author Geremy Condra <gcondra@google.com> Thu Mar 28 14:29:25 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Mar 28 14:29:25 2013 -0700
tree 3aa7853fc49dd7e7de1906a95da669c0a9665c3b
parent 7a80915f2a741198dbbbfd963a401a3df881c716
parent f4d5f3e1f6db56c80959428591bb3dbbe685b010

am f4d5f3e1: Merge "Add missing seinfo tag from mac_permissions.xml policy."

* commit 'f4d5f3e1f6db56c80959428591bb3dbbe685b010':
  Add missing seinfo tag from mac_permissions.xml policy.

bluetooth.te

diff --git a/bluetooth.te b/bluetooth.te
index 31ea064..c6ff619 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 3fde109..7785f4e 100644
--- a/file_contexts
+++ b/file_contexts
@@ -147,6 +147,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