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

Commit 1a65e438 authored by Wei Wang's avatar Wei Wang Committed by android-build-merger
Browse files

Merge "init.rc: start netd and zygote early for file based encryption devices"

am: 4bf2bc07

Change-Id: I2fad834e5a2daa2823838caff0322b4b43fce47d
parents 5f3e037e 4bf2bc07
Loading
Loading
Loading
Loading
+7 −2
Original line number Diff line number Diff line
@@ -290,8 +290,7 @@ on late-init
    # /data, which in turn can only be loaded when system properties are present.
    trigger post-fs-data

    # Now we can start zygote for file base encryption devices in
    # init.{$device}.rc
    # Now we can start zygote for devices with file based encryption
    trigger zygote-start

    # Load persist properties and override properties (if enabled) from /data.
@@ -303,6 +302,12 @@ on late-init
    trigger early-boot
    trigger boot

on post-fs-data && property:ro.crypto.state=encrypted && property:ro.crypto.type=file
    start netd

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

on post-fs
    start logd
    # once everything is setup, no need to modify /