Merge "Move zygote start after loading persist properties"

am: 5b993e3861

Change-Id: Ie416015b570d055a228a4090aa6e2b176b2b6863
This commit is contained in:
Tom Cherry 2018-09-06 12:32:59 -07:00 committed by android-build-merger
commit d71c8bec98

View file

@ -306,12 +306,12 @@ 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 devices with file based encryption
trigger zygote-start
# Load persist properties and override properties (if enabled) from /data.
trigger load_persist_props_action
# Now we can start zygote for devices with file based encryption
trigger zygote-start
# Remove a file to wake up anything waiting for firmware.
trigger firmware_mounts_complete