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

Commit 8ebd76c9 authored by Karuna Wadhera's avatar Karuna Wadhera Committed by Gerrit Code Review
Browse files

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

parents 02341319 b1da9dc6

rootdir/init.rc

+1 −4
Original line number Original line Diff line number Diff line
@@ -995,11 +995,8 @@ on post-fs-data 
    mkdir /data/misc/stats-service/ 0770 statsd system

    mkdir /data/misc/stats-service/ 0770 statsd system

    mkdir /data/misc/train-info/ 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_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

    perform_apex_config





    exec_start system_aconfigd_mainline_init

    exec_start system_aconfigd_mainline_init