Merge "vendor: sepolicy: cleanup of adb of network property" into android-6.0
diff --git a/sepolicy/shell.te b/sepolicy/shell.te
deleted file mode 100644
index d97aa8c..0000000
--- a/sepolicy/shell.te
+++ /dev/null
@@ -1,6 +0,0 @@
-###########################
-## OmniROM common sepolicy
-##
-
-allow shell adbtcp_prop:property_service set;
-# allow shell dalvikcache_data_file:file write;
diff --git a/sepolicy/system.te b/sepolicy/system.te
deleted file mode 100644
index a573553..0000000
--- a/sepolicy/system.te
+++ /dev/null
@@ -1,9 +0,0 @@
-###########################
-## OmniROM common sepolicy
-##
-
-# allow adb related properties to be set
-allow system_server adbtcp_prop:property_service set;
-
-# System server dynamically loads some dexfiles
-# allow system_server dex2oat_exec:file rx_file_perms;
diff --git a/sepolicy/system_server.te b/sepolicy/system_server.te
index f4c31eb..bb2de87 100644
--- a/sepolicy/system_server.te
+++ b/sepolicy/system_server.te
@@ -1 +1,2 @@
allow system_server storage_stub_file:dir { getattr };
+allow system_server adbtcp_prop:property_service set;