summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Crane <cranes@google.com>2022-11-22 22:30:24 +0000
committerStephen Crane <cranes@google.com>2022-11-23 00:36:27 +0000
commit502c76f22b6b06adc0784cfe9e20364cd2348d06 (patch)
tree79171b352e36263c216a2781870c773607a80f8f
parent33f38db80f0b220a2efd17f240684b8d19e54216 (diff)
Allow Trusty storageproxy property
Allows the Trusty storageproxyd to set ro.vendor.trusty.storage.fs_ready when the data filesystems are ready for use, and allows vendor init to query and wait on this property. Test: m raven-userdebug, flash, test app loading Bug: 258018785 Change-Id: If995d35be490fbca6c99ef9f73f2842f5c488bd4 Merged-In: If995d35be490fbca6c99ef9f73f2842f5c488bd4
-rw-r--r--whitechapel/vendor/google/property.te3
-rw-r--r--whitechapel/vendor/google/property_contexts3
-rw-r--r--whitechapel/vendor/google/storageproxyd.te2
-rw-r--r--whitechapel/vendor/google/vendor_init.te3
4 files changed, 11 insertions, 0 deletions
diff --git a/whitechapel/vendor/google/property.te b/whitechapel/vendor/google/property.te
index 31ee4b8f..70c72b68 100644
--- a/whitechapel/vendor/google/property.te
+++ b/whitechapel/vendor/google/property.te
@@ -55,3 +55,6 @@ vendor_internal_prop(vendor_dynamic_sensor_prop)
# UWB calibration
system_vendor_config_prop(vendor_uwb_calibration_prop)
+
+# Trusty storage FS ready
+vendor_internal_prop(vendor_trusty_storage_prop)
diff --git a/whitechapel/vendor/google/property_contexts b/whitechapel/vendor/google/property_contexts
index eabb6f69..0dd3d463 100644
--- a/whitechapel/vendor/google/property_contexts
+++ b/whitechapel/vendor/google/property_contexts
@@ -117,3 +117,6 @@ vendor.dynamic_sensor. u:object_r:vendor_dynamic_sensor
# uwb
ro.vendor.uwb.calibration. u:object_r:vendor_uwb_calibration_prop:s0 exact string
+
+# Trusty
+ro.vendor.trusty.storage.fs_ready u:object_r:vendor_trusty_storage_prop:s0
diff --git a/whitechapel/vendor/google/storageproxyd.te b/whitechapel/vendor/google/storageproxyd.te
index ada64441..bf29cbf2 100644
--- a/whitechapel/vendor/google/storageproxyd.te
+++ b/whitechapel/vendor/google/storageproxyd.te
@@ -19,3 +19,5 @@ read_fstab(tee)
# storageproxyd starts before /data is mounted. It handles /data not being there
# gracefully. However, attempts to access /data trigger a denial.
dontaudit tee unlabeled:dir { search };
+
+set_prop(tee, vendor_trusty_storage_prop)
diff --git a/whitechapel/vendor/google/vendor_init.te b/whitechapel/vendor/google/vendor_init.te
index 9686bccb..8ebe5e52 100644
--- a/whitechapel/vendor/google/vendor_init.te
+++ b/whitechapel/vendor/google/vendor_init.te
@@ -38,3 +38,6 @@ set_prop(vendor_init, vendor_fingerprint_prop)
# Display
set_prop(vendor_init, vendor_display_prop)
+
+# Trusty storage FS ready
+get_prop(vendor_init, vendor_trusty_storage_prop)