Rename vpnprofilestore to legacykeystore.
Bug: 191373871 Test: N/A Merged-In: I3f11827909bd37a2127069de82670776a8e192b3 Change-Id: I3f11827909bd37a2127069de82670776a8e192b3
This commit is contained in:
parent
81a677b948
commit
4678660d83
14 changed files with 16 additions and 12 deletions
|
@ -72,6 +72,7 @@
|
|||
keystore_maintenance_service
|
||||
keystore2_key_contexts_file
|
||||
legacy_permission_service
|
||||
legacykeystore_service
|
||||
location_time_zone_manager_service
|
||||
media_communication_service
|
||||
media_metrics_service
|
||||
|
@ -140,7 +141,6 @@
|
|||
vibrator_manager_service
|
||||
virtualization_service
|
||||
vpn_management_service
|
||||
vpnprofilestore_service
|
||||
watchdog_metadata_file
|
||||
wifi_key
|
||||
zygote_config_prop))
|
||||
|
|
|
@ -37,9 +37,9 @@ 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.legacykeystore u:object_r:legacykeystore_service:s0
|
||||
android.security.maintenance u:object_r:keystore_maintenance_service:s0
|
||||
android.security.remoteprovisioning u:object_r:remoteprovisioning_service:s0
|
||||
android.security.vpnprofilestore u:object_r:vpnprofilestore_service:s0
|
||||
android.service.gatekeeper.IGateKeeperService u:object_r:gatekeeper_service:s0
|
||||
app_binding u:object_r:app_binding_service:s0
|
||||
app_hibernation u:object_r:app_hibernation_service:s0
|
||||
|
|
|
@ -6,4 +6,6 @@ set_prop(wificond, ctl_default_prop)
|
|||
|
||||
get_prop(wificond, hwservicemanager_prop)
|
||||
|
||||
allow wificond legacykeystore_service:service_manager find;
|
||||
|
||||
init_daemon_domain(wificond)
|
||||
|
|
|
@ -677,6 +677,7 @@ full_treble_only(`
|
|||
-credstore_service
|
||||
-keystore_maintenance_service
|
||||
-keystore_service
|
||||
-legacykeystore_service
|
||||
-mediadrmserver_service
|
||||
-mediaextractor_service
|
||||
-mediametrics_service
|
||||
|
@ -684,7 +685,6 @@ full_treble_only(`
|
|||
-nfc_service
|
||||
-radio_service
|
||||
-virtual_touchpad_service
|
||||
-vpnprofilestore_service
|
||||
-vr_hwc_service
|
||||
-vr_manager_service
|
||||
userdebug_or_eng(`-hal_face_service')
|
||||
|
|
|
@ -20,7 +20,7 @@ add_service(keystore, apc_service)
|
|||
add_service(keystore, keystore_compat_hal_service)
|
||||
add_service(keystore, authorization_service)
|
||||
add_service(keystore, keystore_maintenance_service)
|
||||
add_service(keystore, vpnprofilestore_service)
|
||||
add_service(keystore, legacykeystore_service)
|
||||
|
||||
# Check SELinux permissions.
|
||||
selinux_check_access(keystore)
|
||||
|
|
|
@ -21,6 +21,7 @@ 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 legacykeystore_service, service_manager_type;
|
||||
type lpdump_service, service_manager_type;
|
||||
type mediaserver_service, service_manager_type;
|
||||
type mediametrics_service, service_manager_type;
|
||||
|
@ -43,7 +44,6 @@ type update_engine_stable_service, service_manager_type;
|
|||
type virtualization_service, service_manager_type;
|
||||
type virtual_touchpad_service, service_manager_type;
|
||||
type vold_service, service_manager_type;
|
||||
type vpnprofilestore_service, service_manager_type;
|
||||
type vr_hwc_service, service_manager_type;
|
||||
type vrflinger_vsync_service, service_manager_type;
|
||||
|
||||
|
|
|
@ -635,7 +635,7 @@ define(`use_keystore', `
|
|||
allow keystore $1:process getattr;
|
||||
allow $1 apc_service:service_manager find;
|
||||
allow $1 keystore_service:service_manager find;
|
||||
allow $1 vpnprofilestore_service:service_manager find;
|
||||
allow $1 legacykeystore_service:service_manager find;
|
||||
binder_call($1, keystore)
|
||||
binder_call(keystore, $1)
|
||||
')
|
||||
|
|
|
@ -75,6 +75,7 @@
|
|||
keystore_maintenance_service
|
||||
keystore2_key_contexts_file
|
||||
legacy_permission_service
|
||||
legacykeystore_service
|
||||
location_time_zone_manager_service
|
||||
media_communication_service
|
||||
media_metrics_service
|
||||
|
@ -145,7 +146,6 @@
|
|||
vibrator_manager_service
|
||||
virtualization_service
|
||||
vpn_management_service
|
||||
vpnprofilestore_service
|
||||
watchdog_metadata_file
|
||||
wifi_key
|
||||
zygote_config_prop))
|
||||
|
|
|
@ -37,9 +37,9 @@ 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.legacykeystore u:object_r:legacykeystore_service:s0
|
||||
android.security.maintenance u:object_r:keystore_maintenance_service:s0
|
||||
android.security.remoteprovisioning u:object_r:remoteprovisioning_service:s0
|
||||
android.security.vpnprofilestore u:object_r:vpnprofilestore_service:s0
|
||||
android.service.gatekeeper.IGateKeeperService u:object_r:gatekeeper_service:s0
|
||||
app_binding u:object_r:app_binding_service:s0
|
||||
app_hibernation u:object_r:app_hibernation_service:s0
|
||||
|
|
|
@ -6,4 +6,6 @@ set_prop(wificond, ctl_default_prop)
|
|||
|
||||
get_prop(wificond, hwservicemanager_prop)
|
||||
|
||||
allow wificond legacykeystore_service:service_manager find;
|
||||
|
||||
init_daemon_domain(wificond)
|
||||
|
|
|
@ -677,6 +677,7 @@ full_treble_only(`
|
|||
-credstore_service
|
||||
-keystore_maintenance_service
|
||||
-keystore_service
|
||||
-legacykeystore_service
|
||||
-mediadrmserver_service
|
||||
-mediaextractor_service
|
||||
-mediametrics_service
|
||||
|
@ -684,7 +685,6 @@ full_treble_only(`
|
|||
-nfc_service
|
||||
-radio_service
|
||||
-virtual_touchpad_service
|
||||
-vpnprofilestore_service
|
||||
-vr_hwc_service
|
||||
-vr_manager_service
|
||||
userdebug_or_eng(`-hal_face_service')
|
||||
|
|
|
@ -20,7 +20,7 @@ add_service(keystore, apc_service)
|
|||
add_service(keystore, keystore_compat_hal_service)
|
||||
add_service(keystore, authorization_service)
|
||||
add_service(keystore, keystore_maintenance_service)
|
||||
add_service(keystore, vpnprofilestore_service)
|
||||
add_service(keystore, legacykeystore_service)
|
||||
|
||||
# Check SELinux permissions.
|
||||
selinux_check_access(keystore)
|
||||
|
|
|
@ -22,6 +22,7 @@ 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 legacykeystore_service, service_manager_type;
|
||||
type lpdump_service, service_manager_type;
|
||||
type mediaserver_service, service_manager_type;
|
||||
type mediametrics_service, service_manager_type;
|
||||
|
@ -44,7 +45,6 @@ type update_engine_stable_service, service_manager_type;
|
|||
type virtualization_service, service_manager_type;
|
||||
type virtual_touchpad_service, service_manager_type;
|
||||
type vold_service, service_manager_type;
|
||||
type vpnprofilestore_service, service_manager_type;
|
||||
type vr_hwc_service, service_manager_type;
|
||||
type vrflinger_vsync_service, service_manager_type;
|
||||
|
||||
|
|
|
@ -635,7 +635,7 @@ define(`use_keystore', `
|
|||
allow keystore $1:process getattr;
|
||||
allow $1 apc_service:service_manager find;
|
||||
allow $1 keystore_service:service_manager find;
|
||||
allow $1 vpnprofilestore_service:service_manager find;
|
||||
allow $1 legacykeystore_service:service_manager find;
|
||||
binder_call($1, keystore)
|
||||
binder_call(keystore, $1)
|
||||
')
|
||||
|
|
Loading…
Reference in a new issue