Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 40082926 authored by Wei Wang's avatar Wei Wang Committed by Android (Google) Code Review
Browse files

Merge "Ensure update_verifier run before zygote" into oc-dev

parents 353c6cd3 53842e7d
Loading
Loading
Loading
Loading
+21 −8
Original line number Diff line number Diff line
@@ -498,10 +498,25 @@ 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
    # A/B update verifier that marks a successful boot.
    exec_start update_verifier_nonencrypted
    start netd
    start zygote
    start zygote_secondary
@@ -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