Merge "audit mtp sync permission" am: 6fc134e3e5
am: 4c445999d1

* commit '4c445999d1e60bdae8961ffc0c3ec4a9c0269aa0':
  audit mtp sync permission
diff --git a/service.te b/service.te
index dbf1ced..c1772d4 100644
--- a/service.te
+++ b/service.te
@@ -41,7 +41,6 @@
 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 @@
 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
diff --git a/untrusted_app.te b/untrusted_app.te
index 0ac3cc9..7422fb2 100644
--- a/untrusted_app.te
+++ b/untrusted_app.te
@@ -78,6 +78,7 @@
 allow untrusted_app servicemanager:service_manager list;
 
 allow untrusted_app drmserver_service:service_manager find;
+allow untrusted_app healthd_service:service_manager find;
 allow untrusted_app mediaserver_service:service_manager find;
 allow untrusted_app nfc_service:service_manager find;
 allow untrusted_app radio_service:service_manager find;