Merge "Revert^5 "Run module code only after KeyMints receive module info"" into main am: 82040a8c5b am: 84855526a5
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3533429
Change-Id: I92eb780bef6b537bb1b849459f72a808434eafa4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/rootdir/init.rc b/rootdir/init.rc
index 255ef88..1545d09 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -997,11 +997,8 @@
mkdir /data/misc/stats-service/ 0770 statsd system
mkdir /data/misc/train-info/ 0770 statsd system
- # TODO(b/369375199): Remove once attest modules flagging is removed.
+ # Wait for apexd to finish activating APEXes before starting more processes.
wait_for_prop apexd.status activated
- # Wait for KeyMints to receive APEX module info before starting code from updateable APEXes.
- # This is to prevent APEX modules from interfering in module measurement.
- wait_for_prop keystore.module_hash.sent true
perform_apex_config
exec_start system_aconfigd_mainline_init