Merge "Rename vpnprofilestore to legacykeystore in 31.0 mapping files." am: f541acd250 am: ffb2010a0a

Original change: https://android-review.googlesource.com/c/platform/system/sepolicy/+/1771593

Change-Id: I7699781df4dccce679a8baccdb5e47074e0fb3db
This commit is contained in:
Daniel Norman 2021-07-20 00:44:25 +00:00 committed by Automerger Merge Worker
commit 072de7b4b2
2 changed files with 4 additions and 4 deletions

View file

@ -524,6 +524,7 @@
(type labeledfs)
(type launcherapps_service)
(type legacy_permission_service)
(type legacykeystore_service)
(type libc_debug_prop)
(type light_service)
(type linkerconfig_file)
@ -1183,7 +1184,6 @@
(type vold_status_prop)
(type vpn_data_file)
(type vpn_management_service)
(type vpnprofilestore_service)
(type vr_hwc)
(type vr_hwc_exec)
(type vr_hwc_service)
@ -2502,6 +2502,7 @@
(typeattribute labeledfs_31_0)
(typeattribute launcherapps_service_31_0)
(typeattribute legacy_permission_service_31_0)
(typeattribute legacykeystore_service_31_0)
(typeattribute libc_debug_prop_31_0)
(typeattribute light_service_31_0)
(typeattribute linkerconfig_file_31_0)
@ -3235,7 +3236,6 @@
(typeattribute vold_status_prop_31_0)
(typeattribute vpn_data_file_31_0)
(typeattribute vpn_management_service_31_0)
(typeattribute vpnprofilestore_service_31_0)
(typeattribute vr_hwc_31_0)
(typeattribute vr_hwc_exec_31_0)
(typeattribute vr_hwc_service_31_0)

View file

@ -530,6 +530,7 @@
(expandtypeattribute (labeledfs_31_0) true)
(expandtypeattribute (launcherapps_service_31_0) true)
(expandtypeattribute (legacy_permission_service_31_0) true)
(expandtypeattribute (legacykeystore_service_31_0) true)
(expandtypeattribute (libc_debug_prop_31_0) true)
(expandtypeattribute (light_service_31_0) true)
(expandtypeattribute (linkerconfig_file_31_0) true)
@ -1189,7 +1190,6 @@
(expandtypeattribute (vold_status_prop_31_0) true)
(expandtypeattribute (vpn_data_file_31_0) true)
(expandtypeattribute (vpn_management_service_31_0) true)
(expandtypeattribute (vpnprofilestore_service_31_0) true)
(expandtypeattribute (vr_hwc_31_0) true)
(expandtypeattribute (vr_hwc_exec_31_0) true)
(expandtypeattribute (vr_hwc_service_31_0) true)
@ -1760,6 +1760,7 @@
(typeattributeset labeledfs_31_0 (labeledfs))
(typeattributeset launcherapps_service_31_0 (launcherapps_service))
(typeattributeset legacy_permission_service_31_0 (legacy_permission_service))
(typeattributeset legacykeystore_service_31_0 (legacykeystore_service))
(typeattributeset libc_debug_prop_31_0 (libc_debug_prop))
(typeattributeset light_service_31_0 (light_service))
(typeattributeset linkerconfig_file_31_0 (linkerconfig_file))
@ -2419,7 +2420,6 @@
(typeattributeset vold_status_prop_31_0 (vold_status_prop))
(typeattributeset vpn_data_file_31_0 (vpn_data_file))
(typeattributeset vpn_management_service_31_0 (vpn_management_service))
(typeattributeset vpnprofilestore_service_31_0 (vpnprofilestore_service))
(typeattributeset vr_hwc_31_0 (vr_hwc))
(typeattributeset vr_hwc_exec_31_0 (vr_hwc_exec))
(typeattributeset vr_hwc_service_31_0 (vr_hwc_service))