Revert "Allow vendors to set remote_prov_prop properties"
This reverts commit a87c7be41929f7cea8e4ed09bf1a17402dcc1e9b.
Reason for revert: I was mistaken and this isn't a property that the vendor should set, but the OEM should override from the product partition. That doesn't require sepolicy changes.
Bug: 256109167
Change-Id: Idebfb623dce960b2b595386ade1e4c4b92a6e402
diff --git a/private/compat/33.0/33.0.ignore.cil b/private/compat/33.0/33.0.ignore.cil
index e6fe12e..c2c1a4b 100644
--- a/private/compat/33.0/33.0.ignore.cil
+++ b/private/compat/33.0/33.0.ignore.cil
@@ -22,7 +22,6 @@
keystore_config_prop
permissive_mte_prop
prng_seeder
- remote_prov_prop
servicemanager_prop
system_net_netd_service
timezone_metadata_prop
diff --git a/private/property.te b/private/property.te
index eda66c8..cac04d3 100644
--- a/private/property.te
+++ b/private/property.te
@@ -34,6 +34,7 @@
system_internal_prop(pm_prop)
system_internal_prop(profcollectd_node_id_prop)
system_internal_prop(radio_cdma_ecm_prop)
+system_internal_prop(remote_prov_prop)
system_internal_prop(rollback_test_prop)
system_internal_prop(setupwizard_prop)
system_internal_prop(snapuserd_prop)
@@ -626,10 +627,9 @@
neverallow domain system_and_vendor_property_type:{file property_service} *;
neverallow {
- # Only init, vendor_init and the remote provisioner can set the ro.remote_provisioning.* props
+ # Only init and the remote provisioner can set the ro.remote_provisioning.* props
domain
-init
- -vendor_init
-remote_prov_app
} remote_prov_prop:property_service set;
diff --git a/public/property.te b/public/property.te
index a24e482..a9e61b5 100644
--- a/public/property.te
+++ b/public/property.te
@@ -226,7 +226,6 @@
system_public_prop(qemu_sf_lcd_density_prop)
system_public_prop(radio_control_prop)
system_public_prop(radio_prop)
-system_public_prop(remote_prov_prop)
system_public_prop(serialno_prop)
system_public_prop(surfaceflinger_color_prop)
system_public_prop(system_prop)
diff --git a/public/vendor_init.te b/public/vendor_init.te
index 74bf488..61fa686 100644
--- a/public/vendor_init.te
+++ b/public/vendor_init.te
@@ -246,7 +246,6 @@
set_prop(vendor_init, qemu_hw_prop)
set_prop(vendor_init, radio_control_prop)
set_prop(vendor_init, rebootescrow_hal_prop)
-set_prop(vendor_init, remote_prov_prop)
set_prop(vendor_init, serialno_prop)
set_prop(vendor_init, soc_prop)
set_prop(vendor_init, surfaceflinger_color_prop)