Merge "Revert "Allow vendors to set remote_prov_prop properties"" am: 2c818d9b32

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

Change-Id: Iee78fae49a39e410b6336f6b0a8cd441b40d171d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Andrew Scull 2022-11-01 13:34:05 +00:00 committed by Automerger Merge Worker
commit 54c71bab9c
4 changed files with 2 additions and 5 deletions

View file

@ -24,7 +24,6 @@
keystore_config_prop
permissive_mte_prop
prng_seeder
remote_prov_prop
servicemanager_prop
system_net_netd_service
timezone_metadata_prop

View file

@ -34,6 +34,7 @@ system_internal_prop(perf_drop_caches_prop)
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 {
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;

View file

@ -226,7 +226,6 @@ system_public_prop(qemu_hw_prop)
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)

View file

@ -246,7 +246,6 @@ set_prop(vendor_init, log_prop)
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)