Merge "Refactor selinux_policy_nonsystem to separate phonies for vendor/odm" into main
diff --git a/private/bug_map b/private/bug_map
index 97d9713..a4873a7 100644
--- a/private/bug_map
+++ b/private/bug_map
@@ -1,3 +1,4 @@
+crash_dump keystore process b/376065666
dnsmasq netd fifo_file b/77868789
dnsmasq netd unix_stream_socket b/77868789
gmscore_app system_data_file dir b/146166941
diff --git a/private/property.te b/private/property.te
index 662aa13..3694666 100644
--- a/private/property.te
+++ b/private/property.te
@@ -72,6 +72,7 @@
system_internal_prop(suspend_debug_prop)
system_internal_prop(system_service_enable_prop)
system_internal_prop(ctl_artd_pre_reboot_prop)
+system_internal_prop(trusty_security_vm_sys_prop)
# Properties which can't be written outside system
diff --git a/private/property_contexts b/private/property_contexts
index f32b483..d147ac2 100644
--- a/private/property_contexts
+++ b/private/property_contexts
@@ -1743,3 +1743,7 @@
# Properties for enabling/disabling system services
ro.system_settings.service.odp_enabled u:object_r:system_service_enable_prop:s0 exact bool
ro.system_settings.service.backgound_install_control_enabled u:object_r:system_service_enable_prop:s0 exact bool
+
+# Properties related to Trusty VMs
+trusty.security_vm.nonsecure_vm_ready u:object_r:trusty_security_vm_sys_prop:s0 exact bool
+trusty.security_vm.vm_cid u:object_r:trusty_security_vm_sys_prop:s0 exact int