Merge "libprocessgroup: Better error checking for string -> int conversion" into main
diff --git a/rootdir/init.rc b/rootdir/init.rc
index 0b45e73..f1670ae 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -995,11 +995,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