commit 2dc0a19e97a38bd2ae66784e1f13eb3409e6453f
author Karuna Wadhera <kwadhera@google.com> Mon Jan 06 14:59:21 2025 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jan 06 14:59:21 2025 -0800
tree 100824cc4cb13c079ceb0a51fd86578a97fc62a8
parent b1da9dc655caf1a70f8f0244404207c8ec491ed4

Revert^2 "Run module code only after KeyMints receive module info"

This reverts commit b1da9dc655caf1a70f8f0244404207c8ec491ed4.

Reason for revert: Re-submitting the original change once Trusty pre-builts are updated.

Change-Id: Iaf3f535dd5640d8302aeec376b3afaa5b9859f55

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index f1670ae..0b45e73 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -995,8 +995,11 @@
     mkdir /data/misc/stats-service/ 0770 statsd system
     mkdir /data/misc/train-info/ 0770 statsd system
 
-    # Wait for apexd to finish activating APEXes before starting more processes.
+    # TODO(b/369375199): Remove once attest modules flagging is removed.
     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