Rename vpnprofilestore to legacykeystore in 31.0 mapping files.
This service was renamed in
commit 8aaf796f980f21a8acda73180a876095b960fc28
after the mapping files were originally created in
commit 4f20ff73eeb3cd5062d01080f60e41b045aed1c3.
Bug: 191304621
Test: Merge redfin_vf_s T-based system with S-based vendor.
Change-Id: I3430f13a3438c06c6cb469a35a80390f83b1c0b4
diff --git a/prebuilts/api/31.0/plat_pub_versioned.cil b/prebuilts/api/31.0/plat_pub_versioned.cil
index 7928315..3f2c0be 100644
--- a/prebuilts/api/31.0/plat_pub_versioned.cil
+++ b/prebuilts/api/31.0/plat_pub_versioned.cil
@@ -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)
diff --git a/private/compat/31.0/31.0.cil b/private/compat/31.0/31.0.cil
index c33bc73..f3abde4 100644
--- a/private/compat/31.0/31.0.cil
+++ b/private/compat/31.0/31.0.cil
@@ -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))