Merge "audit mtp sync permission"
am: 6fc134e3e5
* commit '6fc134e3e529e2a79c754593b2ca660cabcd81ed':
audit mtp sync permission
diff --git a/bluetooth.te b/bluetooth.te
index 071e40b..4f240fb 100644
--- a/bluetooth.te
+++ b/bluetooth.te
@@ -3,6 +3,8 @@
app_domain(bluetooth)
net_domain(bluetooth)
+wakelock_use(bluetooth);
+
# Data file accesses.
allow bluetooth bluetooth_data_file:dir create_dir_perms;
allow bluetooth bluetooth_data_file:notdevfile_class_set create_file_perms;
diff --git a/service.te b/service.te
index c1772d4..dbf1ced 100644
--- a/service.te
+++ b/service.te
@@ -41,6 +41,7 @@
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 85dcd3d..4c50497 100644
--- a/service_contexts
+++ b/service_contexts
@@ -34,6 +34,7 @@
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 6c21cc5..0ac3cc9 100644
--- a/untrusted_app.te
+++ b/untrusted_app.te
@@ -74,6 +74,9 @@
# TODO: narrow this to just MediaProvider
allow untrusted_app mnt_media_rw_file:dir search;
+# allow cts to query all services
+allow untrusted_app servicemanager:service_manager list;
+
allow untrusted_app drmserver_service:service_manager find;
allow untrusted_app mediaserver_service:service_manager find;
allow untrusted_app nfc_service:service_manager find;