commit 2a6d0ace882979537c8b2589be3399a0e77d244b
author Geremy Condra <gcondra@google.com> Tue Mar 26 11:58:08 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Mar 26 11:58:08 2013 -0700
tree 596886f9d74d86cc053e0b2dea583f828e3b859a
parent 5a55c1196ce26df4b569bdf197c3a39d7a078c05
parent 1620c671f2b946333958d07420643caf98534a01

am 1620c671: Merge "Introduce security labels for 2 new device nodes."

* commit '1620c671f2b946333958d07420643caf98534a01':
  Introduce security labels for 2 new device nodes.

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