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

Merge "Ensure update_verifier run before zygote" am: a42ec8a9e3

Browse source 
am: 29a0f68c11

Change-Id: Ic7e700c71062486cc5a281c9fa36c39354893ecf
This commit is contained in:
Wei Wang 2017-04-21 22:24:54 +00:00 • committed by android-build-merger
commit 73fc12cbda
1 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
rootdir/init.rc
View file

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