Merge "Ensure update_verifier run before zygote" am: a42ec8a9e3 am: 29a0f68c11

am: 73fc12cbda

Change-Id: Ife005b30f6115747309f0b3f096f5380e17f192a
This commit is contained in:
Wei Wang 2017-04-21 22:28:27 +00:00 committed by android-build-merger
commit 1214e236eb

View file

@ -498,13 +498,28 @@ on post-fs-data
# Set indication (checked by vold) that we have finished this action
#setprop vold.post_fs_data_done 1
# This trigger will be triggered before 'zygote-start' since there is no zygote-start defined in
# current init.rc. It is recommended to put unnecessary data/ initialization from post-fs-data
# to start-zygote to unblock zygote start.
# It is recommended to put unnecessary data/ initialization from post-fs-data
# to start-zygote in device's init.rc to unblock zygote start.
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 zygote
start zygote_secondary
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 zygote
start zygote_secondary
on zygote-start && property:ro.crypto.state=encrypted && property:ro.crypto.type=file
start netd
start zygote
start zygote_secondary
# A/B update verifier that marks a successful boot.
exec_start update_verifier_nonencrypted
start netd
start zygote
start zygote_secondary
on boot
# basic network init
@ -603,8 +618,6 @@ on boot
class_start core
on nonencrypted
# A/B update verifier that marks a successful boot.
exec_start update_verifier_nonencrypted
class_start main
class_start late_start