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

Commit f5670782 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [7513497, 7518418, 7517880, 7517881, 7517882, 7517883,... 

Merge cherrypicks of [7513497, 7518418, 7517880, 7517881, 7517882, 7517883, 7517884, 7517885, 7517886, 7517956, 7517957, 7518438, 7518102, 7517887, 7518141, 7518142, 7518143, 7518144, 7517888, 7517889, 7517890, 7517891, 7518439, 7518440, 7518441, 7518442, 7518443, 7518029, 7518104, 7517892, 7517893, 7518061, 7518444, 7517894, 7517895, 7518030, 7518031, 7518445, 7517896, 7517969, 7517897, 7518105, 7518145, 7518146, 7518446] into pi-qpr3-b-release

Change-Id: I2dea75a115dae0c91f6efaceb3212f4744c50513
parents 6f2198b3 cee9908b

rootdir/init.rc

+4 −10
Original line number Original line Diff line number Diff line
@@ -381,6 +381,10 @@ on late-fs 
    # HALs required before storage encryption can get unlocked (FBE/FDE)

    # HALs required before storage encryption can get unlocked (FBE/FDE)

    class_start early_hal

    class_start early_hal





    # Check and mark a successful boot, before mounting userdata with mount_all.

    # No-op for non-A/B device.

    exec_start update_verifier_nonencrypted



on post-fs-data

on post-fs-data

    # We chown/chmod /data again so because mount is run as root + defaults

    # We chown/chmod /data again so because mount is run as root + defaults

    chown system system /data

    chown system system /data
@@ -558,22 +562,16 @@ 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

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

    exec_start update_verifier_nonencrypted

    start netd

    start netd

    start zygote

    start zygote

    start zygote_secondary

    start zygote_secondary





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

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 netd

    start zygote

    start zygote

    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

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

    exec_start update_verifier_nonencrypted

    start netd

    start netd

    start zygote

    start zygote

    start zygote_secondary

    start zygote_secondary
@@ -700,15 +698,11 @@ on property:vold.decrypt=trigger_post_fs_data 
    trigger zygote-start

    trigger zygote-start





on property:vold.decrypt=trigger_restart_min_framework

on property:vold.decrypt=trigger_restart_min_framework

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

    exec_start update_verifier

    class_start main

    class_start main





on property:vold.decrypt=trigger_restart_framework

on property:vold.decrypt=trigger_restart_framework

    stop surfaceflinger

    stop surfaceflinger

    start surfaceflinger

    start surfaceflinger

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

    exec_start update_verifier

    class_start main

    class_start main

    class_start late_start

    class_start late_start