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 "Revert "Ensure update_verifier run before zygote"" am: a037bddd8a am: 615211301e 

am: 2e211888c0

Change-Id: Ie9eb8fc13d35a615ff14d120816e675d8ea20f2b
This commit is contained in:
Keun-young Park 2017-04-22 01:12:06 +00:00 committed by android-build-merger
parent 401dd4ccfd 2e211888c0
commit 1a6eb1628c
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

@ -498,28 +498,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
@ -618,6 +603,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