Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f7ab2616 authored by Karuna Wadhera's avatar Karuna Wadhera Committed by Android (Google) Code Review
Browse files

Merge "Run module code only after KeyMints receive module info" into main

parents e01bb455 199214e7
Loading
Loading
Loading
Loading
+4 −1
Original line number Diff line number Diff line
@@ -995,8 +995,11 @@ on post-fs-data
    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/400439023): 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