Merge "Pass *testing.T to ModuleForTests" into main
diff --git a/private/adbd.te b/private/adbd.te
index c8226f3..138c8f5 100644
--- a/private/adbd.te
+++ b/private/adbd.te
@@ -178,6 +178,10 @@
allow adbd perfetto_traces_data_file:file r_file_perms;
allow adbd perfetto_traces_data_file:dir r_dir_perms;
+# Allow to pull ProfilingManager Perfetto traces.
+allow adbd perfetto_traces_profiling_data_file:file r_file_perms;
+allow adbd perfetto_traces_profiling_data_file:dir r_dir_perms;
+
# Allow to push and manage configs in /data/misc/perfetto-configs.
allow adbd perfetto_configs_data_file:dir rw_dir_perms;
allow adbd perfetto_configs_data_file:file create_file_perms;
diff --git a/private/genfs_contexts b/private/genfs_contexts
index a872a04..0a0c9cb 100644
--- a/private/genfs_contexts
+++ b/private/genfs_contexts
@@ -266,6 +266,7 @@
genfscon tracefs /events/vmscan/mm_vmscan_direct_reclaim_end/ u:object_r:debugfs_tracing:s0
genfscon tracefs /events/vmscan/mm_vmscan_kswapd_wake/ u:object_r:debugfs_tracing:s0
genfscon tracefs /events/vmscan/mm_vmscan_kswapd_sleep/ u:object_r:debugfs_tracing:s0
+genfscon tracefs /events/android_vendor_lmk/ u:object_r:debugfs_tracing:s0
genfscon tracefs /events/binder/binder_transaction/ u:object_r:debugfs_tracing:s0
genfscon tracefs /events/binder/binder_transaction_received/ u:object_r:debugfs_tracing:s0
genfscon tracefs /events/binder/binder_lock/ u:object_r:debugfs_tracing:s0
diff --git a/private/mmd.te b/private/mmd.te
index fec356e..1c0eca1 100644
--- a/private/mmd.te
+++ b/private/mmd.te
@@ -5,7 +5,7 @@
init_daemon_domain(mmd)
-# Set mmd.enabled_aconfig properties.
+# Set mmd.enabled_aconfig and zram backing device size.
set_prop(mmd, mmd_status_prop)
get_prop(mmd, mmd_prop)
get_prop(mmd, device_config_mmd_native_prop)
@@ -33,3 +33,7 @@
# Allow mmd to write to statsd socket.
unix_socket_send(mmd, statsdw, statsd)
+# Allow mmd to interact with statsd binder calls for pulled atoms.
+allow mmd stats_service:service_manager find;
+allow mmd statsmanager_service:service_manager find;
+binder_call(mmd, statsd)
diff --git a/private/property_contexts b/private/property_contexts
index 56d9127..d80931c 100644
--- a/private/property_contexts
+++ b/private/property_contexts
@@ -1824,3 +1824,4 @@
mmd. u:object_r:mmd_prop:s0
mmd.zram.enabled u:object_r:mmd_shared_prop:s0 exact bool
mmd.enabled_aconfig u:object_r:mmd_status_prop:s0 exact bool
+mmd.status. u:object_r:mmd_status_prop:s0
diff --git a/private/shell.te b/private/shell.te
index 3e45e1f..492d8f5 100644
--- a/private/shell.te
+++ b/private/shell.te
@@ -67,6 +67,9 @@
# ... and /data/misc/perfetto-traces/bugreport/ .
allow shell perfetto_traces_bugreport_data_file:dir rw_dir_perms;
allow shell perfetto_traces_bugreport_data_file:file { r_file_perms unlink };
+# ... and /data/misc/perfetto-traces/profiling/ .
+allow shell perfetto_traces_profiling_data_file:dir rw_dir_perms;
+allow shell perfetto_traces_profiling_data_file:file { r_file_perms unlink };
# Allow shell to create/remove configs stored in /data/misc/perfetto-configs.
allow shell perfetto_configs_data_file:dir rw_dir_perms;
diff --git a/private/statsd.te b/private/statsd.te
index 3db5c60..acc3aa6 100644
--- a/private/statsd.te
+++ b/private/statsd.te
@@ -98,6 +98,10 @@
allow statsd mediaserver_service:service_manager find;
binder_call(statsd, mediaserver)
+# Allow statsd to interact with mmd
+allow statsd mmd_service:service_manager find;
+binder_call(statsd, mmd)
+
# Allow logd access.
read_logd(statsd)
control_logd(statsd)