Merge "init.rc: merge the zygote-start actions" into main
This commit is contained in:
commit
620ea56515
1 changed files with 2 additions and 20 deletions
|
@ -533,7 +533,7 @@ on late-init
|
|||
# Should be before netd, but after apex, properties and logging is available.
|
||||
trigger load_bpf_programs
|
||||
|
||||
# Now we can start zygote for devices with file based encryption
|
||||
# Now we can start zygote.
|
||||
trigger zygote-start
|
||||
|
||||
# Remove a file to wake up anything waiting for firmware.
|
||||
|
@ -1056,25 +1056,7 @@ on 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.
|
||||
on zygote-start && property:ro.crypto.state=unencrypted
|
||||
wait_for_prop odsign.verification.done 1
|
||||
# A/B update verifier that marks a successful boot.
|
||||
exec_start update_verifier_nonencrypted
|
||||
start statsd
|
||||
start netd
|
||||
start zygote
|
||||
start zygote_secondary
|
||||
|
||||
on zygote-start && property:ro.crypto.state=unsupported
|
||||
wait_for_prop odsign.verification.done 1
|
||||
# A/B update verifier that marks a successful boot.
|
||||
exec_start update_verifier_nonencrypted
|
||||
start statsd
|
||||
start netd
|
||||
start zygote
|
||||
start zygote_secondary
|
||||
|
||||
on zygote-start && property:ro.crypto.state=encrypted && property:ro.crypto.type=file
|
||||
on zygote-start
|
||||
wait_for_prop odsign.verification.done 1
|
||||
# A/B update verifier that marks a successful boot.
|
||||
exec_start update_verifier_nonencrypted
|
||||
|
|
Loading…
Reference in a new issue