ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "init.rc: start netd and zygote early for file based encryption devices" am: 4bf2bc078f am: 1a65e43878

Browse source 
am: 3b272c7bf8

Change-Id: Ie44f4fd8a04b1fa1d0a5c6f7e01410246589c9d9
This commit is contained in:
Wei Wang 2017-03-09 06:24:27 +00:00 • committed by android-build-merger
commit 36baabf07b
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
rootdir/init.rc
View file

@ -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 /