Merge "allow systemserver to sigkill clat"
diff --git a/microdroid/system/private/property.te b/microdroid/system/private/property.te
index 3077301..de32003 100644
--- a/microdroid/system/private/property.te
+++ b/microdroid/system/private/property.te
@@ -6,6 +6,9 @@
system_restricted_prop(device_config_runtime_native_prop)
system_restricted_prop(device_config_runtime_native_boot_prop)
+typeattribute dalvik_config_prop dalvik_config_prop_type;
+typeattribute dalvik_dynamic_config_prop dalvik_config_prop_type;
+
# Don't audit legacy ctl. property handling. We only want the newer permission check to appear
# in the audit log
dontaudit domain {
diff --git a/private/genfs_contexts b/private/genfs_contexts
index 8e35c46..759ac38 100644
--- a/private/genfs_contexts
+++ b/private/genfs_contexts
@@ -240,10 +240,12 @@
genfscon tracefs /events/block/block_rq_complete/ u:object_r:debugfs_tracing:s0
genfscon tracefs /synthetic_events u:object_r:debugfs_tracing:s0
-genfscon tracefs /events/synthetic/rss_stat_throttled u:object_r:debugfs_tracing:s0
-
genfscon debugfs /tracing/synthetic_events u:object_r:debugfs_tracing:s0
+
+genfscon tracefs /events/synthetic/rss_stat_throttled u:object_r:debugfs_tracing:s0
genfscon debugfs /tracing/events/synthetic/rss_stat_throttled u:object_r:debugfs_tracing:s0
+genfscon tracefs /events/synthetic/suspend_resume_minimal u:object_r:debugfs_tracing:s0
+genfscon debugfs /tracing/events/synthetic/suspend_resume_minimal u:object_r:debugfs_tracing:s0
genfscon tracefs /trace_clock u:object_r:debugfs_tracing:s0
genfscon tracefs /buffer_size_kb u:object_r:debugfs_tracing:s0
diff --git a/private/system_server.te b/private/system_server.te
index ff863cd..7fea6e7 100644
--- a/private/system_server.te
+++ b/private/system_server.te
@@ -793,6 +793,9 @@
# such as camera shutter enforcement
get_prop(system_server, audio_config_prop)
+# StorageManager service reads media config while checking if transcoding is supported.
+get_prop(system_server, media_config_prop)
+
# system server reads this property to keep track of whether server configurable flags have been
# reset during current boot.
get_prop(system_server, device_config_reset_performed_prop)