aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnthony Hugh <ahugh@google.com>2015-10-22 22:22:44 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-10-22 22:22:44 +0000
commit753148a8691b7b5d29ee0ebab400c1eb7b2a7c27 (patch)
tree0fe477c7399069b4ac34b13895060229cdf05109
parent4bb2bdc1b01f04f824bf13dafb66411e48aa2275 (diff)
parent2d8c2d9779ccae7bf43b2b1e6e995c71cfd777df (diff)
downloadandroid_external_sepolicy-753148a8691b7b5d29ee0ebab400c1eb7b2a7c27.tar.gz
android_external_sepolicy-753148a8691b7b5d29ee0ebab400c1eb7b2a7c27.tar.bz2
android_external_sepolicy-753148a8691b7b5d29ee0ebab400c1eb7b2a7c27.zip
Merge "Revert "Update sepolicy to allow ThermalObserver system service"" into cw-e-dev
-rw-r--r--service.te1
-rw-r--r--service_contexts1
2 files changed, 0 insertions, 2 deletions
diff --git a/service.te b/service.te
index f0aa122..56478d0 100644
--- a/service.te
+++ b/service.te
@@ -41,7 +41,6 @@ type devicestoragemonitor_service, system_server_service, service_manager_type;
type diskstats_service, system_api_service, system_server_service, service_manager_type;
type display_service, app_api_service, system_server_service, service_manager_type;
type DockObserver_service, system_server_service, service_manager_type;
-type ThermalObserver_service, system_server_service, service_manager_type;
type dreams_service, system_api_service, system_server_service, service_manager_type;
type dropbox_service, app_api_service, system_server_service, service_manager_type;
type ethernet_service, app_api_service, system_server_service, service_manager_type;
diff --git a/service_contexts b/service_contexts
index 4c50497..85dcd3d 100644
--- a/service_contexts
+++ b/service_contexts
@@ -34,7 +34,6 @@ diskstats u:object_r:diskstats_service:s0
display.qservice u:object_r:surfaceflinger_service:s0
display u:object_r:display_service:s0
DockObserver u:object_r:DockObserver_service:s0
-ThermalObserver u:object_r:DockObserver_service:s0
dreams u:object_r:dreams_service:s0
drm.drmManager u:object_r:drmserver_service:s0
dropbox u:object_r:dropbox_service:s0