Relabel drm related props from exported*_prop
To clean up bad context name exported[23]_default_prop
Bug: 155844385
Test: m selinux_policy
Change-Id: I9f9ddb0d44c4cea9bd1724df730bb7be9a6fb2d2
diff --git a/private/compat/27.0/27.0.ignore.cil b/private/compat/27.0/27.0.ignore.cil
index c35edcc..ceac1dd 100644
--- a/private/compat/27.0/27.0.ignore.cil
+++ b/private/compat/27.0/27.0.ignore.cil
@@ -51,6 +51,7 @@
device_config_reset_performed_prop
device_config_netd_native_prop
dnsresolver_service
+ drm_service_config_prop
exfat
exported2_config_prop
exported2_default_prop
@@ -121,6 +122,7 @@
lowpan_prop
lowpan_service
media_config_prop
+ mediadrm_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 70e875b..3a1c1f2 100644
--- a/private/compat/30.0/30.0.cil
+++ b/private/compat/30.0/30.0.cil
@@ -1359,9 +1359,11 @@
(typeattributeset exported3_default_prop_30_0
( exported3_default_prop
camera_config_prop
+ drm_service_config_prop
hdmi_config_prop
lmkd_config_prop
media_config_prop
+ mediadrm_config_prop
recovery_config_prop
telephony_config_prop
zram_config_prop))
diff --git a/private/drmserver.te b/private/drmserver.te
index afe4f0a..8449c3e 100644
--- a/private/drmserver.te
+++ b/private/drmserver.te
@@ -5,3 +5,5 @@
type_transition drmserver apk_data_file:sock_file drmserver_socket;
typeattribute drmserver_socket coredomain_socket;
+
+get_prop(drmserver, drm_service_config_prop)
diff --git a/private/mediaprovider_app.te b/private/mediaprovider_app.te
index 6cf9dba..fcc8734 100644
--- a/private/mediaprovider_app.te
+++ b/private/mediaprovider_app.te
@@ -50,3 +50,5 @@
#Allow MediaProvider to see if sdcardfs is in use
get_prop(mediaprovider_app, storage_config_prop)
+
+get_prop(mediaprovider_app, drm_service_config_prop)
diff --git a/private/mediaserver.te b/private/mediaserver.te
index fa2fc08..7fb8029 100644
--- a/private/mediaserver.te
+++ b/private/mediaserver.te
@@ -13,4 +13,5 @@
set_prop(mediaserver, audio_prop)
+get_prop(mediaserver, drm_service_config_prop)
get_prop(mediaserver, media_config_prop)
diff --git a/private/property_contexts b/private/property_contexts
index af7b162..b73ba1a 100644
--- a/private/property_contexts
+++ b/private/property_contexts
@@ -339,8 +339,6 @@
persist.sys.dalvik.vm.lib.2 u:object_r:dalvik_runtime_prop:s0 exact string
-drm.service.enabled u:object_r:exported3_default_prop:s0 exact bool
-
keyguard.no_require_sim u:object_r:exported3_default_prop:s0 exact bool
media.recorder.show_manufacturer_and_model u:object_r:exported3_default_prop:s0 exact bool
@@ -521,7 +519,10 @@
build.version.extensions. u:object_r:module_sdkextensions_prop:s0 prefix int
-drm.64bit.enabled u:object_r:exported2_default_prop:s0 exact bool
+drm.64bit.enabled u:object_r:mediadrm_config_prop:s0 exact bool
+media.mediadrmservice.enable u:object_r:mediadrm_config_prop:s0 exact bool
+
+drm.service.enabled u:object_r:drm_service_config_prop:s0 exact bool
dumpstate.dry_run u:object_r:exported_dumpstate_prop:s0 exact bool
dumpstate.unroot u:object_r:exported_dumpstate_prop:s0 exact bool
@@ -664,8 +665,6 @@
aaudio.mmap_policy u:object_r:exported_default_prop:s0 exact int
aaudio.wakeup_delay_usec u:object_r:exported_default_prop:s0 exact int
-media.mediadrmservice.enable u:object_r:exported_default_prop:s0 exact bool
-
persist.rcs.supported u:object_r:exported_default_prop:s0 exact int
ro.bionic.2nd_arch u:object_r:cpu_variant_prop:s0 exact string
diff --git a/public/domain.te b/public/domain.te
index 4d5a394..d4fbc62 100644
--- a/public/domain.te
+++ b/public/domain.te
@@ -108,6 +108,7 @@
get_prop(domain, init_service_status_prop)
get_prop(domain, libc_debug_prop)
get_prop(domain, logd_prop)
+get_prop(domain, mediadrm_config_prop)
get_prop(domain, socket_hook_prop)
get_prop(domain, surfaceflinger_prop)
get_prop(domain, telephony_status_prop)
diff --git a/public/property.te b/public/property.te
index 076fdcb..b6701e5 100644
--- a/public/property.te
+++ b/public/property.te
@@ -109,6 +109,7 @@
system_vendor_config_prop(camera_config_prop)
system_vendor_config_prop(cpu_variant_prop)
system_vendor_config_prop(dalvik_config_prop)
+system_vendor_config_prop(drm_service_config_prop)
system_vendor_config_prop(exported_camera_prop)
system_vendor_config_prop(exported_config_prop)
system_vendor_config_prop(exported_default_prop)
@@ -120,6 +121,7 @@
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(mediadrm_config_prop)
system_vendor_config_prop(recovery_config_prop)
system_vendor_config_prop(storage_config_prop)
system_vendor_config_prop(surfaceflinger_prop)