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

Commit 861a5d27 authored by Martijn Coenen's avatar Martijn Coenen Committed by Automerger Merge Worker
Browse files

Merge "Support asynchronous odsign." am: 5463f859 am: e6186ea2 

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

Change-Id: I9ceaf23fe260c69bdc435bc1c6292e1b76e9941f
parents 03a321d3 e6186ea2

rootdir/init.rc

+8 −1
Original line number Original line Diff line number Diff line
@@ -902,7 +902,11 @@ on post-fs-data 




    # Start the on-device signing daemon, and wait for it to finish, to ensure

    # Start the on-device signing daemon, and wait for it to finish, to ensure

    # ART artifacts are generated if needed.

    # ART artifacts are generated if needed.

    exec_start odsign

    start odsign



    # Before we can lock keys and proceed to the next boot stage, wait for

    # odsign to be done with the key

    wait_for_prop odsign.key.done 1





    # After apexes are mounted, tell keymaster early boot has ended, so it will

    # After apexes are mounted, tell keymaster early boot has ended, so it will

    # stop allowing use of early-boot keys

    # stop allowing use of early-boot keys
@@ -944,6 +948,7 @@ on post-fs-data 
# It is recommended to put unnecessary data/ initialization from 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.

# to start-zygote in device's init.rc to unblock zygote start.

on zygote-start && property:ro.crypto.state=unencrypted

on zygote-start && property:ro.crypto.state=unencrypted

    wait_for_prop odsign.verification.done 1

    # A/B update verifier that marks a successful boot.

    # A/B update verifier that marks a successful boot.

    exec_start update_verifier_nonencrypted

    exec_start update_verifier_nonencrypted

    start statsd

    start statsd
@@ -952,6 +957,7 @@ on zygote-start && property:ro.crypto.state=unencrypted 
    start zygote_secondary

    start zygote_secondary





on zygote-start && property:ro.crypto.state=unsupported

on zygote-start && property:ro.crypto.state=unsupported

    wait_for_prop odsign.verification.done 1

    # A/B update verifier that marks a successful boot.

    # A/B update verifier that marks a successful boot.

    exec_start update_verifier_nonencrypted

    exec_start update_verifier_nonencrypted

    start statsd

    start statsd
@@ -960,6 +966,7 @@ on zygote-start && property:ro.crypto.state=unsupported 
    start zygote_secondary

    start zygote_secondary





on zygote-start && property:ro.crypto.state=encrypted && property:ro.crypto.type=file

on zygote-start && property:ro.crypto.state=encrypted && property:ro.crypto.type=file

    wait_for_prop odsign.verification.done 1

    # A/B update verifier that marks a successful boot.

    # A/B update verifier that marks a successful boot.

    exec_start update_verifier_nonencrypted

    exec_start update_verifier_nonencrypted

    start statsd

    start statsd