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

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

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

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



Change-Id: I80ed39365edc5a9a1aa6f7d7fe29198c24fc5247
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 037ef4de 02341319

rootdir/init.rc

+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/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