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

Commit 2e211888 authored by Keun-young Park's avatar Keun-young Park Committed by android-build-merger
Browse files

Merge "Revert "Ensure update_verifier run before zygote"" am: a037bddd 

am: 61521130

Change-Id: I8331e8769b00f50bc4009d935c3bd6c7b6668381
parents 73fc12cb 61521130

rootdir/init.rc

+8 −21
Original line number Diff line number Diff line
@@ -495,25 +495,10 @@ 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
@@ -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