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

Commit 1dfec1d8 authored by Eric Biggers's avatar Eric Biggers Committed by Automerger Merge Worker
Browse files

Merge "init.rc: merge the zygote-start actions" into main am: 620ea565 am: 6d086b5a 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2653210



Change-Id: I696ff93a51f9fbdef72c5178b7c063f0be1ab1a4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1681c731 6d086b5a

rootdir/init.rc

+2 −20
Original line number Diff line number Diff line
@@ -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