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

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

Merge "Revert "Run module code only after KeyMints receive module info"" into main am: 8ebd76c9 

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



Change-Id: I9ceeeba5579f928b5da372bca21ba03f2d2d9b09
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e37d84ae 8ebd76c9

rootdir/init.rc

+1 −4
Original line number Diff line number Diff line
@@ -995,11 +995,8 @@ on post-fs-data 
    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