openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

Change-Id: I9d279cc422fcae2bf8828081d7304de10baf9832
This commit is contained in:
Automerger Merge Worker 2020-03-02 10:33:47 +00:00
parent aebe5f91b0 2f11663fc9
commit f53cca4d26
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rootdir/init.rc
View File

@ -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.