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

Merge "Revert "Ensure update_verifier run before zygote""

Browse source 
am: a037bddd8a

Change-Id: I535056ddbe20cd43d844167b72840105b13eeb64
This commit is contained in:
Keun-young Park 2017-04-22 01:05:36 +00:00 • committed by android-build-merger
commit 615211301e
1 changed files with 8 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
rootdir/init.rc
View file

@ -495,28 +495,13 @@ on post-fs-data
# Set indication (checked by vold) that we have finished this action
#setprop vold.post_fs_data_done 1
# 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
# 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.
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 zygote
start zygote_secondary
start netd
start zygote
start zygote_secondary
on boot
# basic network init
@ -615,6 +600,8 @@ 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