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

Commit 7ff75659 authored by Karuna Wadhera's avatar Karuna Wadhera Committed by Automerger Merge Worker
Browse files

Merge "Revert^4 "Run module code only after KeyMints receive module info""... 

Merge "Revert^4 "Run module code only after KeyMints receive module info"" into main am: 158a0c9e am: 6f5e5ae2

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3497310



Change-Id: Id34b84fb6befee938be64ac2c3ad77796535538f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents dc8b0328 6f5e5ae2

rootdir/init.rc

+4 −1
Original line number Diff line number Diff line
@@ -997,8 +997,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/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