am dbb82fd8: Merge "Revert "Various minor policy fixes based on CTS.""
* commit 'dbb82fd8f063fdc5854f9d6359d2be0a570ad0cc':
Revert "Various minor policy fixes based on CTS."
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.
diff --git a/file_contexts b/file_contexts
index 0d2db38..d3c26b5 100644
--- a/file_contexts
+++ b/file_contexts
@@ -140,6 +140,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
