From e226b96e7ca404619b6cc8868756ceb4a4fca862 Mon Sep 17 00:00:00 2001 From: Neil Fuller <nfuller@google.com> Date: Tue, 27 Jun 2017 19:31:05 +0100 Subject: [PATCH] Revert "DO NOT MERGE. Revert "Enable the TimeZoneManagerService"" This reinstates the selinux changes for the timezone service that were reverted on oc-dr1-dev and undesirably merged down to master. This reverts commit 96c619c826418155e1bfe2c0c3f447a040f2feb0. Test: make Bug: 31008728 Change-Id: Ief2129c409de09b2782881a6556d918af59badd9 --- private/platform_app.te | 1 + private/service_contexts | 1 + public/service.te | 1 + 3 files changed, 3 insertions(+) diff --git a/private/platform_app.te b/private/platform_app.te index fd4634a30..78af20ef9 100644 --- a/private/platform_app.te +++ b/private/platform_app.te @@ -50,6 +50,7 @@ allow platform_app mediacasserver_service:service_manager find; allow platform_app persistent_data_block_service:service_manager find; allow platform_app radio_service:service_manager find; allow platform_app surfaceflinger_service:service_manager find; +allow platform_app timezone_service:service_manager find; allow platform_app app_api_service:service_manager find; allow platform_app system_api_service:service_manager find; allow platform_app vr_manager_service:service_manager find; diff --git a/private/service_contexts b/private/service_contexts index 955f300c0..5c5534cfb 100644 --- a/private/service_contexts +++ b/private/service_contexts @@ -149,6 +149,7 @@ telecom u:object_r:telecom_service:s0 telephony.registry u:object_r:registry_service:s0 textclassification u:object_r:textclassification_service:s0 textservices u:object_r:textservices_service:s0 +timezone u:object_r:timezone_service:s0 trust u:object_r:trust_service:s0 tv_input u:object_r:tv_input_service:s0 uimode u:object_r:uimode_service:s0 diff --git a/public/service.te b/public/service.te index 28222a5b6..c52c50a6d 100644 --- a/public/service.te +++ b/public/service.te @@ -128,6 +128,7 @@ type task_service, system_server_service, service_manager_type; type textclassification_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type; type textservices_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type; type telecom_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type; +type timezone_service, system_server_service, service_manager_type; type trust_service, app_api_service, system_server_service, service_manager_type; type tv_input_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type; type uimode_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type; -- GitLab