Merge "ISSUE 6849488 Bluedroid stack, remove system/bluetooth." into jb-mr1-devandroid-sdk-support_r11android-cts-4.2_r2android-cts-4.2_r1android-4.2_r1android-4.2.2_r1.2android-4.2.2_r1.1android-4.2.2_r1android-4.2.1_r1.2android-4.2.1_r1.1android-4.2.1_r1jb-mr1.1-releasejb-mr1.1-devjb-mr1.1-cts-devjb-mr1-releasejb-mr1-dev

4 files changed, 0 insertions, 14 deletions

diff --git a/bluetoothd.te b/bluetoothd.te
deleted file mode 100644
index 640a1da..0000000
--- a/bluetoothd.te
+++ /dev/null
@@ -1,10 +0,0 @@
-# bluetoothd - bluetooth daemon
-type bluetoothd, domain;
-type bluetoothd_exec, exec_type, file_type;
-
-init_daemon_domain(bluetoothd)
-allow bluetoothd self:capability { setuid net_raw net_bind_service net_admin };
-allow bluetoothd self:socket *;
-allow bluetoothd bluetoothd_data_file:dir create_dir_perms;
-allow bluetoothd bluetoothd_data_file:file create_file_perms;
-unix_socket_connect(bluetoothd, dbus, dbusd)
diff --git a/file.te b/file.te
index 451ad1d..128a170 100644
--- a/file.te
+++ b/file.te
@@ -41,7 +41,6 @@ type shell_data_file, file_type, data_file_type;
 # /data/gps
 type gps_data_file, file_type, data_file_type;
 # /data/misc subdirectories
-type bluetoothd_data_file, file_type, data_file_type;
 type bluetooth_data_file, file_type, data_file_type;
 type keystore_data_file, file_type, data_file_type;
 type vpn_data_file, file_type, data_file_type;
diff --git a/file_contexts b/file_contexts
index 8876bfe..05f8021 100644
--- a/file_contexts
+++ b/file_contexts
@@ -100,7 +100,6 @@
 /system/bin/installd	u:object_r:installd_exec:s0
 /system/bin/keystore	u:object_r:keystore_exec:s0
 /system/bin/debuggerd	u:object_r:debuggerd_exec:s0
-/system/bin/bluetoothd	u:object_r:bluetoothd_exec:s0
 /system/bin/wpa_supplicant	u:object_r:wpa_exec:s0
 /system/bin/qemud	u:object_r:qemud_exec:s0
 /system/bin/sdcard      u:object_r:sdcardd_exec:s0
@@ -125,7 +124,6 @@
 /data/tombstones(/.*)?	u:object_r:tombstone_data_file:s0
 /data/local(/.*)?	u:object_r:shell_data_file:s0
 # Misc data
-/data/misc/bluetoothd(/.*)?	u:object_r:bluetoothd_data_file:s0
 /data/misc/bluetooth(/.*)?	u:object_r:bluetooth_data_file:s0
 /data/misc/keystore(/.*)?	u:object_r:keystore_data_file:s0
 /data/misc/vpn(/.*)?		u:object_r:vpn_data_file:s0
diff --git a/system.te b/system.te
index 557a385..4c8c368 100644
--- a/system.te
+++ b/system.te
@@ -106,7 +106,6 @@ unix_socket_connect(system, zygote, zygote)
 unix_socket_connect(system, keystore, keystore)
 unix_socket_connect(system, dbus, dbusd)
 unix_socket_connect(system, gps, gpsd)
-unix_socket_connect(system, bluetooth, bluetoothd)
 unix_socket_send(system, wpa, wpa)
 
 # Communicate over a socket created by surfaceflinger.