ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master"

Browse source
This commit is contained in:
Treehugger Robot 2019-07-11 03:52:57 +00:00 • committed by Gerrit Code Review
commit 7c2e6f4e6f
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
rootdir/init.rc
View file

@ -413,6 +413,10 @@ on late-fs
# HALs required before storage encryption can get unlocked (FBE/FDE) # HALs required before storage encryption can get unlocked (FBE/FDE)
class_start early_hal class_start early_hal
# Check and mark a successful boot, before mounting userdata with mount_all.
# No-op for non-A/B device.
exec_start update_verifier_nonencrypted
on post-fs-data on post-fs-data
mark_post_data mark_post_data
@ -628,22 +632,16 @@ on post-fs-data
# It is recommended to put unnecessary data/ initialization from post-fs-data # It is recommended to put unnecessary data/ initialization from post-fs-data
# to start-zygote in device's init.rc to unblock zygote start. # to start-zygote in device's init.rc to unblock zygote start.
on zygote-start && property:ro.crypto.state=unencrypted on zygote-start && property:ro.crypto.state=unencrypted
# A/B update verifier that marks a successful boot.
exec_start update_verifier_nonencrypted
start netd start netd
start zygote start zygote
start zygote_secondary start zygote_secondary
on zygote-start && property:ro.crypto.state=unsupported on zygote-start && property:ro.crypto.state=unsupported
# A/B update verifier that marks a successful boot.
exec_start update_verifier_nonencrypted
start netd start netd
start zygote start zygote
start zygote_secondary start zygote_secondary
on zygote-start && property:ro.crypto.state=encrypted && property:ro.crypto.type=file on zygote-start && property:ro.crypto.state=encrypted && property:ro.crypto.type=file
# A/B update verifier that marks a successful boot.
exec_start update_verifier_nonencrypted
start netd start netd
start zygote start zygote
start zygote_secondary start zygote_secondary
@ -770,8 +768,6 @@ on property:vold.decrypt=trigger_post_fs_data
trigger zygote-start trigger zygote-start
on property:vold.decrypt=trigger_restart_min_framework on property:vold.decrypt=trigger_restart_min_framework
# A/B update verifier that marks a successful boot.
exec_start update_verifier
class_start main class_start main
on property:vold.decrypt=trigger_restart_framework on property:vold.decrypt=trigger_restart_framework