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

This commit is contained in:
Treehugger Robot 2017-03-09 06:12:32 +00:00 committed by Gerrit Code Review
commit 4bf2bc078f

View file

@ -290,8 +290,7 @@ on late-init
# /data, which in turn can only be loaded when system properties are present. # /data, which in turn can only be loaded when system properties are present.
trigger post-fs-data trigger post-fs-data
# Now we can start zygote for file base encryption devices in # Now we can start zygote for devices with file based encryption
# init.{$device}.rc
trigger zygote-start trigger zygote-start
# Load persist properties and override properties (if enabled) from /data. # Load persist properties and override properties (if enabled) from /data.
@ -303,6 +302,12 @@ on late-init
trigger early-boot trigger early-boot
trigger 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 on post-fs
start logd start logd
# once everything is setup, no need to modify / # once everything is setup, no need to modify /