Rename exported2_config_prop to systemsound_config_prop
Fixing bad names (exported*_prop) on property contexts.
Bug: 152468650
Test: m sepolicy_tests
Change-Id: Ie98212ee0fa89966e70faa83322b65b613f3b3f5
diff --git a/private/compat/26.0/26.0.ignore.cil b/private/compat/26.0/26.0.ignore.cil
index b395855..1773687 100644
--- a/private/compat/26.0/26.0.ignore.cil
+++ b/private/compat/26.0/26.0.ignore.cil
@@ -167,6 +167,7 @@
system_lmk_prop
system_net_netd_hwservice
system_update_service
+ systemsound_config_prop
test_boot_reason_prop
thermal_service
thermalcallback_hwservice
diff --git a/private/compat/27.0/27.0.ignore.cil b/private/compat/27.0/27.0.ignore.cil
index cb500c9..14fb491 100644
--- a/private/compat/27.0/27.0.ignore.cil
+++ b/private/compat/27.0/27.0.ignore.cil
@@ -152,6 +152,7 @@
system_bootstrap_lib_file
system_lmk_prop
system_update_service
+ systemsound_config_prop
test_boot_reason_prop
time_prop
timedetector_service
diff --git a/private/compat/29.0/29.0.cil b/private/compat/29.0/29.0.cil
index 60e6fb1..6bad7fc 100644
--- a/private/compat/29.0/29.0.cil
+++ b/private/compat/29.0/29.0.cil
@@ -1,5 +1,6 @@
;; types removed from current policy
(type ashmemd)
+(type exported2_config_prop)
(type hal_wifi_offload_hwservice)
(type install_recovery)
(type install_recovery_exec)
@@ -1194,7 +1195,7 @@
(typeattributeset ephemeral_app_29_0 (ephemeral_app))
(typeattributeset ethernet_service_29_0 (ethernet_service))
(typeattributeset exfat_29_0 (exfat))
-(typeattributeset exported2_config_prop_29_0 (exported2_config_prop))
+(typeattributeset exported2_config_prop_29_0 (exported2_config_prop systemsound_config_prop))
(typeattributeset exported2_default_prop_29_0 (exported2_default_prop))
(typeattributeset exported2_radio_prop_29_0 (exported2_radio_prop))
(typeattributeset exported2_system_prop_29_0 (exported2_system_prop))
diff --git a/private/domain.te b/private/domain.te
index adb0218..ee545d7 100644
--- a/private/domain.te
+++ b/private/domain.te
@@ -76,13 +76,13 @@
get_prop(domain, exported_dalvik_prop)
get_prop(domain, exported_ffs_prop)
get_prop(domain, exported_system_radio_prop)
- get_prop(domain, exported2_config_prop)
get_prop(domain, exported2_radio_prop)
get_prop(domain, exported2_system_prop)
get_prop(domain, exported2_vold_prop)
get_prop(domain, exported3_default_prop)
get_prop(domain, exported3_radio_prop)
get_prop(domain, exported3_system_prop)
+ get_prop(domain, systemsound_config_prop)
get_prop(domain, vendor_default_prop)
')
compatible_property_only(`
@@ -90,7 +90,6 @@
get_prop({coredomain appdomain shell}, exported_dalvik_prop)
get_prop({coredomain appdomain shell}, exported_ffs_prop)
get_prop({coredomain appdomain shell}, exported_system_radio_prop)
- get_prop({coredomain appdomain shell}, exported2_config_prop)
get_prop({coredomain appdomain shell}, exported2_radio_prop)
get_prop({coredomain appdomain shell}, exported2_system_prop)
get_prop({coredomain appdomain shell}, exported2_vold_prop)
@@ -98,6 +97,7 @@
get_prop({coredomain appdomain shell}, exported3_radio_prop)
get_prop({coredomain appdomain shell}, exported3_system_prop)
get_prop({coredomain appdomain shell}, exported_camera_prop)
+ get_prop({coredomain appdomain shell}, systemsound_config_prop)
get_prop({coredomain appdomain shell}, userspace_reboot_config_prop)
get_prop({coredomain shell}, userspace_reboot_exported_prop)
get_prop({coredomain shell}, userspace_reboot_log_prop)
diff --git a/private/property.te b/private/property.te
index 8a5dd26..1a91a44 100644
--- a/private/property.te
+++ b/private/property.te
@@ -143,7 +143,6 @@
exported_system_prop
exported_system_radio_prop
exported_vold_prop
- exported2_config_prop
exported2_default_prop
exported2_system_prop
exported2_vold_prop
@@ -244,11 +243,11 @@
exported_dalvik_prop
exported_ffs_prop
exported_system_radio_prop
- exported2_config_prop
exported2_system_prop
exported2_vold_prop
exported3_default_prop
exported3_system_prop
+ systemsound_config_prop
-debug_prop
-logd_prop
-nfc_prop
diff --git a/private/property_contexts b/private/property_contexts
index 5baaf9d..cd6a4b0 100644
--- a/private/property_contexts
+++ b/private/property_contexts
@@ -381,11 +381,12 @@
ro.com.android.dataroaming u:object_r:exported3_default_prop:s0 exact bool
ro.com.android.prov_mobiledata u:object_r:exported3_default_prop:s0 exact bool
-ro.config.alarm_alert u:object_r:exported2_config_prop:s0 exact string
-ro.config.media_vol_steps u:object_r:exported2_config_prop:s0 exact int
-ro.config.notification_sound u:object_r:exported2_config_prop:s0 exact string
-ro.config.per_app_memcg u:object_r:exported3_default_prop:s0 exact bool
-ro.config.ringtone u:object_r:exported2_config_prop:s0 exact string
+ro.config.alarm_alert u:object_r:systemsound_config_prop:s0 exact string
+ro.config.media_vol_steps u:object_r:systemsound_config_prop:s0 exact int
+ro.config.notification_sound u:object_r:systemsound_config_prop:s0 exact string
+ro.config.ringtone u:object_r:systemsound_config_prop:s0 exact string
+
+ro.config.per_app_memcg u:object_r:exported3_default_prop:s0 exact bool
ro.control_privapp_permissions u:object_r:exported3_default_prop:s0 exact string