Merge changes I82f0c2ef,I013894de
* changes:
Let VirtualizationService access hypervisor properties
Tag new hypervisor properties
diff --git a/private/property_contexts b/private/property_contexts
index 1474d00..618794e 100644
--- a/private/property_contexts
+++ b/private/property_contexts
@@ -737,7 +737,9 @@
ro.boot.verifiedbootstate u:object_r:bootloader_prop:s0 exact string
ro.boot.veritymode u:object_r:bootloader_prop:s0 exact string
# Properties specific to virtualized deployments of Android
+ro.boot.hypervisor.protected_vm.supported u:object_r:hypervisor_prop:s0 exact bool
ro.boot.hypervisor.version u:object_r:hypervisor_prop:s0 exact string
+ro.boot.hypervisor.vm.supported u:object_r:hypervisor_prop:s0 exact bool
# These ro.X properties are set to values of ro.boot.X by property_service.
ro.baseband u:object_r:bootloader_prop:s0 exact string
diff --git a/private/virtualizationservice.te b/private/virtualizationservice.te
index 5f6375f..05e1664 100644
--- a/private/virtualizationservice.te
+++ b/private/virtualizationservice.te
@@ -64,6 +64,9 @@
# Allow virtualizationservice to read/write its own sysprop. Only the process can do so.
set_prop(virtualizationservice, virtualizationservice_prop)
+# Allow virtualizationservice to inspect hypervisor capabilities.
+get_prop(virtualizationservice, hypervisor_prop)
+
# Allow writing stats to statsd
unix_socket_send(virtualizationservice, statsdw, statsd)