Move audio config props to audio_config_prop
Bug: 155844385
Test: sepolicy_tests
Change-Id: Ic199925b5e3e1c80f1e692c8c5fc2cbb73eda0f5
diff --git a/private/audioserver.te b/private/audioserver.te
index 067152f..5047e2c 100644
--- a/private/audioserver.te
+++ b/private/audioserver.te
@@ -98,3 +98,6 @@
# Allow using wake locks
wakelock_use(audioserver)
+
+# Allow reading audio config props, e.g. af.fast_track_multiplier
+get_prop(audioserver, audio_config_prop)
diff --git a/private/compat/26.0/26.0.ignore.cil b/private/compat/26.0/26.0.ignore.cil
index cb7eb22..a1e8b8c 100644
--- a/private/compat/26.0/26.0.ignore.cil
+++ b/private/compat/26.0/26.0.ignore.cil
@@ -18,6 +18,7 @@
apexd_prop
apexd_tmpfs
app_zygote
+ audio_config_prop
atrace
binder_calls_stats_service
biometric_service
diff --git a/private/compat/27.0/27.0.ignore.cil b/private/compat/27.0/27.0.ignore.cil
index 19cd7fb..a04ca8b 100644
--- a/private/compat/27.0/27.0.ignore.cil
+++ b/private/compat/27.0/27.0.ignore.cil
@@ -17,6 +17,7 @@
apexd_prop
apexd_tmpfs
app_zygote
+ audio_config_prop
atrace
binder_calls_stats_service
biometric_service
diff --git a/private/compat/29.0/29.0.cil b/private/compat/29.0/29.0.cil
index 680d511..f101ed2 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 exported_audio_prop)
(type exported_dalvik_prop)
(type exported_vold_prop)
(type exported2_config_prop)
@@ -1208,7 +1209,7 @@
(typeattributeset exported3_default_prop_29_0 (exported3_default_prop))
(typeattributeset exported3_radio_prop_29_0 (exported3_radio_prop))
(typeattributeset exported3_system_prop_29_0 (exported3_system_prop boot_status_prop))
-(typeattributeset exported_audio_prop_29_0 (exported_audio_prop))
+(typeattributeset exported_audio_prop_29_0 (exported_audio_prop audio_config_prop))
(typeattributeset exported_bluetooth_prop_29_0 (exported_bluetooth_prop))
(typeattributeset exported_config_prop_29_0 (exported_config_prop))
(typeattributeset exported_dalvik_prop_29_0 (exported_dalvik_prop dalvik_config_prop))
diff --git a/private/property_contexts b/private/property_contexts
index dffb3b0..be2996c 100644
--- a/private/property_contexts
+++ b/private/property_contexts
@@ -251,12 +251,13 @@
persist.radio.airplane_mode_on u:object_r:exported2_radio_prop:s0 exact bool
-af.fast_track_multiplier u:object_r:exported3_default_prop:s0 exact int
+af.fast_track_multiplier u:object_r:audio_config_prop:s0 exact int
+ro.af.client_heap_size_kbyte u:object_r:audio_config_prop:s0 exact int
-audio.camerasound.force u:object_r:exported_audio_prop:s0 exact bool
-audio.deep_buffer.media u:object_r:exported3_default_prop:s0 exact bool
-audio.offload.video u:object_r:exported3_default_prop:s0 exact bool
-audio.offload.min.duration.secs u:object_r:exported3_default_prop:s0 exact int
+audio.camerasound.force u:object_r:audio_config_prop:s0 exact bool
+audio.deep_buffer.media u:object_r:audio_config_prop:s0 exact bool
+audio.offload.video u:object_r:audio_config_prop:s0 exact bool
+audio.offload.min.duration.secs u:object_r:audio_config_prop:s0 exact int
camera.disable_zsl_mode u:object_r:exported3_default_prop:s0 exact bool
camera.fifo.disable u:object_r:exported3_default_prop:s0 exact int
@@ -369,8 +370,6 @@
pm.dexopt.install u:object_r:exported_pm_prop:s0 exact string
pm.dexopt.shared u:object_r:exported_pm_prop:s0 exact string
-ro.af.client_heap_size_kbyte u:object_r:exported3_default_prop:s0 exact int
-
ro.apk_verity.mode u:object_r:apk_verity_prop:s0 exact int
ro.audio.monitorRotation u:object_r:exported3_default_prop:s0 exact bool
diff --git a/private/system_server.te b/private/system_server.te
index 18b62a7..ece9107 100644
--- a/private/system_server.te
+++ b/private/system_server.te
@@ -658,9 +658,9 @@
# Read/write the property which keeps track of whether this is the first start of system_server
set_prop(system_server, firstboot_prop)
-# Audio service in system server can read exported audio properties,
+# Audio service in system server can read audio config properties,
# such as camera shutter enforcement
-get_prop(system_server, exported_audio_prop)
+get_prop(system_server, audio_config_prop)
# system server reads this property to keep track of whether server configurable flags have been
# reset during current boot.
diff --git a/public/property.te b/public/property.te
index 8e5a7fc..c150557 100644
--- a/public/property.te
+++ b/public/property.te
@@ -99,9 +99,9 @@
# Properties which can be written only by vendor_init
system_vendor_config_prop(apk_verity_prop)
+system_vendor_config_prop(audio_config_prop)
system_vendor_config_prop(cpu_variant_prop)
system_vendor_config_prop(dalvik_config_prop)
-system_vendor_config_prop(exported_audio_prop)
system_vendor_config_prop(exported_camera_prop)
system_vendor_config_prop(exported_config_prop)
system_vendor_config_prop(exported_default_prop)
diff --git a/public/vendor_init.te b/public/vendor_init.te
index cd96643..c1d6d05 100644
--- a/public/vendor_init.te
+++ b/public/vendor_init.te
@@ -211,7 +211,6 @@
set_prop(vendor_init, bluetooth_audio_hal_prop)
set_prop(vendor_init, cpu_variant_prop)
set_prop(vendor_init, debug_prop)
-set_prop(vendor_init, exported_audio_prop)
set_prop(vendor_init, exported_bluetooth_prop)
set_prop(vendor_init, exported_camera_prop)
set_prop(vendor_init, exported_config_prop)