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

Commit c94cff65 authored by Nikita Ioffe's avatar Nikita Ioffe Committed by Automerger Merge Worker
Browse files

Merge "Observe new apexd status value of "activated" as required." into... 

Merge "Observe new apexd status value of "activated" as required." into rvc-dev am: 1b8c391c am: b80b857b

Change-Id: I8d5c3d22fcd7c4fb6a96513a1abcfe18aebc996c
parents 7cb9bf89 b80b857b

rootdir/init.rc

+2 −2
Original line number Original line Diff line number Diff line
@@ -743,7 +743,7 @@ on post-fs-data 
    mkdir /data/misc/train-info/ 0770 statsd system

    mkdir /data/misc/train-info/ 0770 statsd system





    # Wait for apexd to finish activating APEXes before starting more processes.

    # Wait for apexd to finish activating APEXes before starting more processes.

    wait_for_prop apexd.status ready

    wait_for_prop apexd.status activated

    perform_apex_config

    perform_apex_config





    # Special-case /data/media/obb per b/64566063

    # Special-case /data/media/obb per b/64566063
@@ -758,7 +758,7 @@ on post-fs-data 
    # Allow apexd to snapshot and restore device encrypted apex data in the case

    # Allow apexd to snapshot and restore device encrypted apex data in the case

    # of a rollback. This should be done immediately after DE_user data keys

    # of a rollback. This should be done immediately after DE_user data keys

    # are loaded. APEXes should not access this data until this has been

    # are loaded. APEXes should not access this data until this has been

    # completed.

    # completed and apexd.status becomes "ready".

    exec_start apexd-snapshotde

    exec_start apexd-snapshotde





    # Set SELinux security contexts on upgrade or policy update.

    # Set SELinux security contexts on upgrade or policy update.