Merge "Allow system_server to read property for usb uvc gadget enabled support" into main
diff --git a/build/soong/selinux_test.go b/build/soong/selinux_test.go
index dd980a5..beecf9f 100644
--- a/build/soong/selinux_test.go
+++ b/build/soong/selinux_test.go
@@ -72,7 +72,7 @@
`),
).RunTest(t).TestContext
- collectorModule := ctx.ModuleForTests("se_flags_collector", "").Module()
+ collectorModule := ctx.ModuleForTests(t, "se_flags_collector", "").Module()
collectorData, ok := android.OtherModuleProvider(ctx.OtherModuleProviderAdaptor(), collectorModule, buildFlagsProviderKey)
if !ok {
t.Errorf("se_flags_collector must provide buildFlags")
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