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

Commit f53cca4d authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Observe new apexd status value of "activated" as required." am: 2f11663f 

Change-Id: I9d279cc422fcae2bf8828081d7304de10baf9832
parents aebe5f91 2f11663f

rootdir/init.rc

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



    # 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



    # 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

    # 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

    # completed.

    # completed and apexd.status becomes "ready".

    exec_start apexd-snapshotde



    # Set SELinux security contexts on upgrade or policy update.