Merge "Move ro.audio.* props to audio_config_prop"
diff --git a/prebuilts/api/30.0/public/dumpstate.te b/prebuilts/api/30.0/public/dumpstate.te
index c305175..1724b70 100644
--- a/prebuilts/api/30.0/public/dumpstate.te
+++ b/prebuilts/api/30.0/public/dumpstate.te
@@ -140,6 +140,8 @@
dump_hal(hal_wifi)
dump_hal(hal_graphics_allocator)
dump_hal(hal_neuralnetworks)
+dump_hal(hal_identity)
+
# Vibrate the device after we are done collecting the bugreport
hal_client_domain(dumpstate, hal_vibrator)
diff --git a/private/compat/27.0/27.0.ignore.cil b/private/compat/27.0/27.0.ignore.cil
index 4032646..59b93da 100644
--- a/private/compat/27.0/27.0.ignore.cil
+++ b/private/compat/27.0/27.0.ignore.cil
@@ -6,6 +6,7 @@
(typeattributeset new_objects
( new_objects
aac_drc_prop
+ aaudio_config_prop
activity_task_service
adb_service
app_binding_service
diff --git a/private/compat/30.0/30.0.cil b/private/compat/30.0/30.0.cil
index 9810e2f..4c2a7a2 100644
--- a/private/compat/30.0/30.0.cil
+++ b/private/compat/30.0/30.0.cil
@@ -1381,6 +1381,7 @@
(typeattributeset exported_dalvik_prop_30_0 (exported_dalvik_prop dalvik_config_prop))
(typeattributeset exported_default_prop_30_0
( exported_default_prop
+ aaudio_config_prop
build_odm_prop
build_vendor_prop
surfaceflinger_prop))
diff --git a/private/genfs_contexts b/private/genfs_contexts
index d0fe0d0..89232bc 100644
--- a/private/genfs_contexts
+++ b/private/genfs_contexts
@@ -296,6 +296,7 @@
genfscon debugfs /tracing/events/task/task_rename/ u:object_r:debugfs_tracing:s0
genfscon debugfs /tracing/events/task/task_newtask/ u:object_r:debugfs_tracing:s0
genfscon debugfs /tracing/events/ftrace/print/ u:object_r:debugfs_tracing:s0
+genfscon debugfs /tracing/events/gpu_mem/gpu_mem_total u:object_r:debugfs_tracing:s0
genfscon debugfs /kcov u:object_r:debugfs_kcov:s0
diff --git a/private/gpuservice.te b/private/gpuservice.te
index e0ada3f..c467383 100644
--- a/private/gpuservice.te
+++ b/private/gpuservice.te
@@ -26,6 +26,9 @@
# Needed for dumpsys pipes.
allow gpuservice shell:fifo_file write;
+# Needed for perfetto producer.
+perfetto_producer(gpuservice)
+
# Use socket supplied by adbd, for cmd gpu vkjson etc.
allow gpuservice adbd:unix_stream_socket { read write getattr };
diff --git a/private/property_contexts b/private/property_contexts
index be5281f..d56c89c 100644
--- a/private/property_contexts
+++ b/private/property_contexts
@@ -651,12 +651,12 @@
vold.decrypt u:object_r:vold_status_prop:s0 exact string
-aaudio.hw_burst_min_usec u:object_r:exported_default_prop:s0 exact int
-aaudio.minimum_sleep_usec u:object_r:exported_default_prop:s0 exact int
-aaudio.mixer_bursts u:object_r:exported_default_prop:s0 exact int
-aaudio.mmap_exclusive_policy u:object_r:exported_default_prop:s0 exact int
-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
+aaudio.hw_burst_min_usec u:object_r:aaudio_config_prop:s0 exact int
+aaudio.minimum_sleep_usec u:object_r:aaudio_config_prop:s0 exact int
+aaudio.mixer_bursts u:object_r:aaudio_config_prop:s0 exact int
+aaudio.mmap_exclusive_policy u:object_r:aaudio_config_prop:s0 exact int
+aaudio.mmap_policy u:object_r:aaudio_config_prop:s0 exact int
+aaudio.wakeup_delay_usec u:object_r:aaudio_config_prop:s0 exact int
persist.rcs.supported u:object_r:exported_default_prop:s0 exact int
diff --git a/public/domain.te b/public/domain.te
index d4fbc62..33edfd0 100644
--- a/public/domain.te
+++ b/public/domain.te
@@ -94,6 +94,7 @@
allow domain property_info:file r_file_perms;
# Public readable properties
+get_prop(domain, aaudio_config_prop)
get_prop(domain, build_odm_prop)
get_prop(domain, build_prop)
get_prop(domain, build_vendor_prop)
diff --git a/public/dumpstate.te b/public/dumpstate.te
index d84e529..63eb1e9 100644
--- a/public/dumpstate.te
+++ b/public/dumpstate.te
@@ -143,6 +143,7 @@
dump_hal(hal_thermal)
dump_hal(hal_power)
dump_hal(hal_power_stats)
+dump_hal(hal_identity)
# Vibrate the device after we are done collecting the bugreport
hal_client_domain(dumpstate, hal_vibrator)
diff --git a/public/property.te b/public/property.te
index 704c58d..aeb83f6 100644
--- a/public/property.te
+++ b/public/property.te
@@ -102,6 +102,7 @@
')
# Properties which can be written only by vendor_init
+system_vendor_config_prop(aaudio_config_prop)
system_vendor_config_prop(apk_verity_prop)
system_vendor_config_prop(audio_config_prop)
system_vendor_config_prop(build_odm_prop)
diff --git a/vendor/vendor_modprobe.te b/vendor/vendor_modprobe.te
index 61df9e0..4628ecc 100644
--- a/vendor/vendor_modprobe.te
+++ b/vendor/vendor_modprobe.te
@@ -5,6 +5,7 @@
allow vendor_modprobe proc_modules:file r_file_perms;
allow vendor_modprobe proc_cmdline:file r_file_perms;
+allow vendor_modprobe kmsg_device:chr_file w_file_perms;
allow vendor_modprobe self:global_capability_class_set sys_module;
allow vendor_modprobe kernel:key search;