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

Commit 2f11663f authored by Oli Lan's avatar Oli Lan Committed by Gerrit Code Review
Browse files

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

parents 8d144f66 3cb185e4
Loading
Loading
Loading
Loading
+2 −2
Original line number Original line Diff line number Diff line
@@ -733,7 +733,7 @@ on post-fs-data
    mkdir /data/incremental 0771 system system encryption=Require
    mkdir /data/incremental 0771 system system encryption=Require


    # 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
@@ -748,7 +748,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.