Merge "Allow virtmgr to talk to IVmCapabilitiesService HAL" into main
diff --git a/private/mmd.te b/private/mmd.te
index 9a76909..7770865 100644
--- a/private/mmd.te
+++ b/private/mmd.te
@@ -38,3 +38,7 @@
allow mmd stats_service:service_manager find;
allow mmd statsmanager_service:service_manager find;
binder_call(mmd, statsd)
+
+# Allow mmd to send dump info to dumpstate.
+allow mmd dumpstate:fd use;
+allow mmd dumpstate:fifo_file { getattr write };
diff --git a/private/prefetch.te b/private/prefetch.te
index 21287f3..69008b5 100644
--- a/private/prefetch.te
+++ b/private/prefetch.te
@@ -22,3 +22,7 @@
-init
-shell
} ctl_prefetch_prop:property_service set;
+
+# Allow rootfs so prefetch can walk through directory tree and
+# create a map of inodes -> file path.
+allow prefetch rootfs:dir { open read search getattr };
diff --git a/private/property_contexts b/private/property_contexts
index d7c2c94..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
@@ -508,6 +513,7 @@
ro.camera.enableVirtualCamera u:object_r:camera_config_prop:s0 exact bool
ro.camera.disableHeicUltraHDR u:object_r:camera_config_prop:s0 exact bool
ro.camera.enableSWHEVC u:object_r:camera_config_prop:s0 exact bool
+ro.camera.resultFmqSize u:object_r:camera_config_prop:s0 exact int
ro.camerax.extensions.enabled u:object_r:camerax_extensions_prop:s0 exact bool
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