From 6f6815efde1e6a8be21626f09c328044cdb35e49 Mon Sep 17 00:00:00 2001 From: Victor Hsieh Date: Tue, 18 Jan 2022 12:24:13 -0800 Subject: [PATCH] Remove compos_internal_service Bug: 210998077 Test: m; TH Change-Id: Id3c7fcab56de5f71b00e21bd53829b2471e07d77 --- private/composd.te | 1 - private/odrefresh.te | 5 ----- private/service.te | 1 - private/service_contexts | 1 - 4 files changed, 8 deletions(-) diff --git a/private/composd.te b/private/composd.te index dd61e3935..fd83ff473 100644 --- a/private/composd.te +++ b/private/composd.te @@ -5,7 +5,6 @@ type composd_exec, system_file_type, exec_type, file_type; init_daemon_domain(composd) binder_use(composd) add_service(composd, compos_service) -add_service(composd, compos_internal_service) # Call back into system server binder_call(composd, system_server) diff --git a/private/odrefresh.te b/private/odrefresh.te index 9febf459d..6c34e9fd2 100644 --- a/private/odrefresh.te +++ b/private/odrefresh.te @@ -52,11 +52,6 @@ allow odrefresh composd:fd use; # Run binaries from the CompOS APEX in the same domain allow odrefresh system_file:file execute_no_trans; -# Make binder calls back to composd -binder_use(odrefresh) -allow odrefresh compos_internal_service:service_manager find; -binder_call(odrefresh, composd) - # Run fd_server in its own domain domain_auto_trans(odrefresh, fd_server_exec, compos_fd_server) diff --git a/private/service.te b/private/service.te index 7e3371559..aa72e3e3e 100644 --- a/private/service.te +++ b/private/service.te @@ -1,5 +1,4 @@ type attention_service, system_server_service, service_manager_type; -type compos_internal_service, service_manager_type; type compos_service, service_manager_type; type dynamic_system_service, system_api_service, system_server_service, service_manager_type; type gsi_service, service_manager_type; diff --git a/private/service_contexts b/private/service_contexts index 2e79abbd7..35b9dcc6f 100644 --- a/private/service_contexts +++ b/private/service_contexts @@ -80,7 +80,6 @@ android.security.metrics u:object_r:keystore_metrics_service:s0 android.security.remoteprovisioning u:object_r:remoteprovisioning_service:s0 android.service.gatekeeper.IGateKeeperService u:object_r:gatekeeper_service:s0 android.system.composd u:object_r:compos_service:s0 -android.system.composd.internal u:object_r:compos_internal_service:s0 android.system.virtualizationservice u:object_r:virtualization_service:s0 app_binding u:object_r:app_binding_service:s0 app_hibernation u:object_r:app_hibernation_service:s0