Merge "Allow lmkd to access vendor_lmk trace event" into main
diff --git a/private/property_contexts b/private/property_contexts
index ef2a788..aa863c5 100644
--- a/private/property_contexts
+++ b/private/property_contexts
@@ -479,6 +479,11 @@
# to disable usecase validator for game mode
ro.audio.usecase_validator_enabled u:object_r:audio_config_prop:s0 exact bool
+# Boolean property used in UsbAlsaManager and AudioPolicyManager
+# to decide if multiple audio devices of the same type
+# can be connected to audio system at the same time
+ro.audio.same_type_multi_device_allowed u:object_r:audio_config_prop:s0 exact bool
+
# Boolean property used in UsbAlsaManager to decide if only one or multiple
# USB devices can be connected to audio system at a certain time
ro.audio.multi_usb_mode u:object_r:audio_config_prop:s0 exact bool
diff --git a/private/virtualizationmanager.te b/private/virtualizationmanager.te
index 6e973d6..b743d46 100644
--- a/private/virtualizationmanager.te
+++ b/private/virtualizationmanager.te
@@ -153,3 +153,7 @@
# virtualizationmanager uses libselinux to check if VM is allowed to access requested
# tee services.
selinux_check_access(virtualizationmanager)
+
+# virtualizationmanager needs to talk to IVmCapabilitiesService HAL to allow specific VMs to
+# issue vendor-private smcs.
+hal_client_domain(virtualizationmanager, hal_vm_capabilities);
diff --git a/public/te_macros b/public/te_macros
index 78e75a0..d75be83 100644
--- a/public/te_macros
+++ b/public/te_macros
@@ -611,7 +611,10 @@
# Userdebug or eng builds
# SELinux rules which apply only to userdebug or eng builds
#
-define(`userdebug_or_eng', ifelse(target_build_variant, `eng', $1, ifelse(target_build_variant, `userdebug', $1)))
+define(`userdebug_or_eng', ifelse(target_build_variant, `eng', $1, ifelse(target_build_variant, `userdebug', $1,
+#
+# SUPPRESSED_BY_USERDEBUG_OR_ENG -- this marker is used by CTS -- do not modify
+)))
#####################################
# asan builds
diff --git a/vendor/file_contexts b/vendor/file_contexts
index dc09d79..a2ae309 100644
--- a/vendor/file_contexts
+++ b/vendor/file_contexts
@@ -209,3 +209,4 @@
/(vendor|system/vendor)/lib(64)?/libutilscallstack\.so u:object_r:same_process_hal_file:s0
/(vendor|system/vendor)/lib(64)?/libz\.so u:object_r:same_process_hal_file:s0
/(vendor|system/vendor)/bin/hw/android\.hardware\.virtualization\.capabilities\.capabilities_service-noop u:object_r:hal_vm_capabilities_default_exec:s0
+/(vendor|system/vendor)/bin/hw/android\.hardware\.virtualization\.capabilities\.capabilities_service-default u:object_r:hal_vm_capabilities_default_exec:s0
