commit 7a852858434c3b4205dc28cd6f3b7045558fe950
author Geremy Condra <gcondra@google.com> Tue Mar 26 11:41:44 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Mar 26 11:41:44 2013 -0700
tree 10cbb801ae67cb8a081149a8c4759a063d34c94e
parent a851e6dab970d548f83ef0705bee7aff1da0dd9f
parent cd4104e84b438827fddd6a7fe6cb86e91392152d

am cd4104e8: Revert "Revert "Dynamic insertion of pubkey to mac_permissions.xml""

* commit 'cd4104e84b438827fddd6a7fe6cb86e91392152d':
  Revert "Revert "Dynamic insertion of pubkey to mac_permissions.xml""

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 4e6db16..e88f035 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