From f3fe4cfc0612cfb92dc3b4693cdcd0b94b15d332 Mon Sep 17 00:00:00 2001 From: Janis Danisevskis Date: Mon, 8 Mar 2021 09:19:38 -0800 Subject: [PATCH] Keystore 2.0: Rename KeystoreUserManager to KeystoreMaintenance Test: N/A Change-Id: I40c07e40cb0a852814058fe89d57c44ea85f1994 --- private/compat/30.0/30.0.ignore.cil | 2 +- private/service_contexts | 2 +- private/system_server.te | 2 +- public/keystore.te | 2 +- public/service.te | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/private/compat/30.0/30.0.ignore.cil b/private/compat/30.0/30.0.ignore.cil index 835f901d5..cbee4b70e 100644 --- a/private/compat/30.0/30.0.ignore.cil +++ b/private/compat/30.0/30.0.ignore.cil @@ -58,6 +58,7 @@ hal_sharedsecret_service hal_weaver_service keystore_compat_hal_service + keystore_maintenance_service keystore2_key_contexts_file legacy_permission_service location_time_zone_manager_service @@ -110,7 +111,6 @@ transformer_service update_engine_stable_service userdata_sysdev - usermanager_service userspace_reboot_metadata_file vcn_management_service vibrator_manager_service diff --git a/private/service_contexts b/private/service_contexts index f522323e6..9a854594b 100644 --- a/private/service_contexts +++ b/private/service_contexts @@ -35,8 +35,8 @@ android.security.authorization u:object_r:authorization_service:s0 android.security.compat u:object_r:keystore_compat_hal_service:s0 android.security.identity u:object_r:credstore_service:s0 android.security.keystore u:object_r:keystore_service:s0 +android.security.maintenance u:object_r:keystore_maintenance_service:s0 android.security.remoteprovisioning u:object_r:remoteprovisioning_service:s0 -android.security.usermanager u:object_r:usermanager_service:s0 android.security.vpnprofilestore u:object_r:vpnprofilestore_service:s0 android.service.gatekeeper.IGateKeeperService u:object_r:gatekeeper_service:s0 android.system.keystore2 u:object_r:keystore_service:s0 diff --git a/private/system_server.te b/private/system_server.te index 349a0b87b..01a086653 100644 --- a/private/system_server.te +++ b/private/system_server.te @@ -817,6 +817,7 @@ allow system_server incident_service:service_manager find; allow system_server incremental_service:service_manager find; allow system_server installd_service:service_manager find; allow system_server iorapd_service:service_manager find; +allow system_server keystore_maintenance_service:service_manager find; allow system_server keystore_service:service_manager find; allow system_server mediaserver_service:service_manager find; allow system_server mediametrics_service:service_manager find; @@ -830,7 +831,6 @@ allow system_server stats_service:service_manager find; allow system_server storaged_service:service_manager find; allow system_server surfaceflinger_service:service_manager find; allow system_server update_engine_service:service_manager find; -allow system_server usermanager_service:service_manager find; allow system_server vold_service:service_manager find; allow system_server wifinl80211_service:service_manager find; userdebug_or_eng(` diff --git a/public/keystore.te b/public/keystore.te index ae7ed9113..7a6074b6a 100644 --- a/public/keystore.te +++ b/public/keystore.te @@ -19,7 +19,7 @@ allow keystore dropbox_service:service_manager find; add_service(keystore, apc_service) add_service(keystore, keystore_compat_hal_service) add_service(keystore, authorization_service) -add_service(keystore, usermanager_service) +add_service(keystore, keystore_maintenance_service) add_service(keystore, vpnprofilestore_service) # Check SELinux permissions. diff --git a/public/service.te b/public/service.te index f6a47bc5e..5b9a86da5 100644 --- a/public/service.te +++ b/public/service.te @@ -19,6 +19,7 @@ type incident_service, service_manager_type; type installd_service, service_manager_type; type credstore_service, app_api_service, service_manager_type; type keystore_compat_hal_service, service_manager_type; +type keystore_maintenance_service, service_manager_type; type keystore_service, service_manager_type; type lpdump_service, service_manager_type; type mediaserver_service, service_manager_type; @@ -39,7 +40,6 @@ type system_suspend_control_internal_service, service_manager_type; type system_suspend_control_service, service_manager_type; type update_engine_service, service_manager_type; type update_engine_stable_service, service_manager_type; -type usermanager_service, service_manager_type; type virtual_touchpad_service, service_manager_type; type vold_service, service_manager_type; type vpnprofilestore_service, service_manager_type;