Merge "Remove sys.vdso property"
diff --git a/private/compat/27.0/27.0.ignore.cil b/private/compat/27.0/27.0.ignore.cil
index 3ec8de1..58f340e 100644
--- a/private/compat/27.0/27.0.ignore.cil
+++ b/private/compat/27.0/27.0.ignore.cil
@@ -114,6 +114,7 @@
lowpan_device
lowpan_prop
lowpan_service
+ media_config_prop
mediaextractor_update_service
mediaswcodec
mediaswcodec_exec
diff --git a/private/compat/30.0/30.0.cil b/private/compat/30.0/30.0.cil
index 13e8dac..7ab350b 100644
--- a/private/compat/30.0/30.0.cil
+++ b/private/compat/30.0/30.0.cil
@@ -1355,6 +1355,7 @@
camera_config_prop
hdmi_config_prop
lmkd_config_prop
+ media_config_prop
zram_config_prop))
(typeattributeset exported3_radio_prop_30_0 (exported3_radio_prop))
(typeattributeset exported3_system_prop_30_0 (exported3_system_prop boot_status_prop))
diff --git a/private/mediaserver.te b/private/mediaserver.te
index 32dfc00..1691da5 100644
--- a/private/mediaserver.te
+++ b/private/mediaserver.te
@@ -14,3 +14,5 @@
allow mediaserver mediatranscoding_service:service_manager find;
set_prop(mediaserver, audio_prop)
+
+get_prop(mediaserver, media_config_prop)
diff --git a/private/property_contexts b/private/property_contexts
index f0e2ded..0e4a8a7 100644
--- a/private/property_contexts
+++ b/private/property_contexts
@@ -343,8 +343,9 @@
media.recorder.show_manufacturer_and_model u:object_r:exported3_default_prop:s0 exact bool
-media.stagefright.cache-params u:object_r:exported3_default_prop:s0 exact string
-media.stagefright.thumbnail.prefer_hw_codecs u:object_r:exported3_default_prop:s0 exact bool
+media.stagefright.cache-params u:object_r:media_config_prop:s0 exact string
+media.stagefright.thumbnail.prefer_hw_codecs u:object_r:media_config_prop:s0 exact bool
+persist.sys.media.avsync u:object_r:media_config_prop:s0 exact bool
persist.bluetooth.a2dp_offload.cap u:object_r:bluetooth_a2dp_offload_prop:s0 exact string
persist.bluetooth.a2dp_offload.disabled u:object_r:bluetooth_a2dp_offload_prop:s0 exact bool
@@ -360,7 +361,6 @@
persist.radio.multisim.config u:object_r:exported3_radio_prop:s0 exact string
persist.sys.dalvik.vm.lib.2 u:object_r:exported2_system_prop:s0 exact string
-persist.sys.media.avsync u:object_r:exported2_system_prop:s0 exact bool
persist.sys.hdmi.keep_awake u:object_r:hdmi_config_prop:s0 exact bool
ro.hdmi.device_type u:object_r:hdmi_config_prop:s0 exact string
diff --git a/public/property.te b/public/property.te
index 7a1e9ca..21ef0fc 100644
--- a/public/property.te
+++ b/public/property.te
@@ -112,6 +112,7 @@
system_vendor_config_prop(hdmi_config_prop)
system_vendor_config_prop(incremental_prop)
system_vendor_config_prop(lmkd_config_prop)
+system_vendor_config_prop(media_config_prop)
system_vendor_config_prop(media_variant_prop)
system_vendor_config_prop(storage_config_prop)
system_vendor_config_prop(surfaceflinger_prop)