Merge "Add setupwizard_esim_prop to access ro.setupwizard.esim_cid_ignore"

private/compat/33.0/33.0.ignore.cil

@@ -59,6 +59,7 @@
     remote_provisioning_service
     rkpdapp
     servicemanager_prop
+    setupwizard_esim_prop
     shutdown_checkpoints_system_data_file
     snapuserd_log_data_file
     stats_config_data_file

private/property.te

@@ -598,6 +598,10 @@ neverallow {
   -init
 } setupwizard_prop:property_service set;
 
+neverallow {
+  domain
+  -init
+} setupwizard_esim_prop:property_service set;
 # ro.product.property_source_order is useless after initialization of ro.product.* props.
 # So making it accessible only from init and vendor_init.
 neverallow {

private/property_contexts

@@ -1450,8 +1450,8 @@ partition.product.verified.root_digest    u:object_r:verity_status_prop:s0 exact
 partition.vendor.verified.root_digest     u:object_r:verity_status_prop:s0 exact string
 partition.odm.verified.root_digest        u:object_r:verity_status_prop:s0 exact string
 
+ro.setupwizard.esim_cid_ignore u:object_r:setupwizard_esim_prop:s0 exact string
 ro.setupwizard.enterprise_mode u:object_r:setupwizard_prop:s0 exact bool
-ro.setupwizard.esim_cid_ignore u:object_r:setupwizard_prop:s0 exact string
 ro.setupwizard.rotation_locked u:object_r:setupwizard_prop:s0 exact bool
 ro.setupwizard.wifi_on_exit    u:object_r:setupwizard_prop:s0 exact bool
 

public/property.te

@@ -88,6 +88,7 @@ system_restricted_prop(property_service_version_prop)
 system_restricted_prop(provisioned_prop)
 system_restricted_prop(restorecon_prop)
 system_restricted_prop(retaildemo_prop)
+system_restricted_prop(setupwizard_esim_prop)
 system_restricted_prop(servicemanager_prop)
 system_restricted_prop(smart_idle_maint_enabled_prop)
 system_restricted_prop(socket_hook_prop)