Remove exported3_radio_prop
It's renamed to radio_control_prop
Bug: 162214733
Test: boot
Change-Id: Idede1a1ab471a354a6f5df12b6889abc7c1ad869
diff --git a/private/app.te b/private/app.te
index 21a6b82..ab9cf3c 100644
--- a/private/app.te
+++ b/private/app.te
@@ -6,6 +6,7 @@
get_prop(appdomain, dalvik_config_prop)
get_prop(appdomain, media_config_prop)
get_prop(appdomain, packagemanager_config_prop)
+get_prop(appdomain, radio_control_prop)
get_prop(appdomain, surfaceflinger_color_prop)
get_prop(appdomain, systemsound_config_prop)
get_prop(appdomain, telephony_config_prop)
diff --git a/private/compat/30.0/30.0.cil b/private/compat/30.0/30.0.cil
index d92d74c..e13c289 100644
--- a/private/compat/30.0/30.0.cil
+++ b/private/compat/30.0/30.0.cil
@@ -12,6 +12,7 @@
(type exported2_radio_prop)
(type exported2_vold_prop)
(type exported3_default_prop)
+(type exported3_radio_prop)
(type ffs_prop)
(type system_radio_prop)
diff --git a/private/coredomain.te b/private/coredomain.te
index f14faf1..a4ab7e7 100644
--- a/private/coredomain.te
+++ b/private/coredomain.te
@@ -10,6 +10,7 @@
get_prop(coredomain, lmkd_config_prop)
get_prop(coredomain, localization_prop)
get_prop(coredomain, pm_prop)
+get_prop(coredomain, radio_control_prop)
get_prop(coredomain, storagemanager_config_prop)
get_prop(coredomain, surfaceflinger_color_prop)
get_prop(coredomain, systemsound_config_prop)
diff --git a/private/radio.te b/private/radio.te
index f43a4c1..2758289 100644
--- a/private/radio.te
+++ b/private/radio.te
@@ -5,8 +5,8 @@
read_runtime_log_tags(radio)
# Property service
+set_prop(radio, radio_control_prop)
set_prop(radio, radio_prop)
-set_prop(radio, exported3_radio_prop)
set_prop(radio, net_radio_prop)
set_prop(radio, telephony_status_prop)
diff --git a/public/domain.te b/public/domain.te
index 3f6b793..f23e832 100644
--- a/public/domain.te
+++ b/public/domain.te
@@ -339,10 +339,6 @@
allow domain apex_mnt_dir:dir { getattr search };
allow domain apex_mnt_dir:lnk_file r_file_perms;
-# Allow to read persist.radio.multisim.config
-# TODO(b/162214733): remove this after cleaning up exported3_radio_prop
-get_prop(domain, radio_control_prop)
-
###
### neverallow rules
###
diff --git a/public/property.te b/public/property.te
index 843bd62..c245ee4 100644
--- a/public/property.te
+++ b/public/property.te
@@ -166,7 +166,6 @@
system_public_prop(dumpstate_options_prop)
system_public_prop(exported_system_prop)
system_public_prop(exported2_system_prop)
-system_public_prop(exported3_radio_prop)
system_public_prop(exported_bluetooth_prop)
system_public_prop(exported_overlay_prop)
system_public_prop(exported_pm_prop)