Merge "init.rc: add a new zygote-start trigger"
diff --git a/rootdir/init.rc b/rootdir/init.rc
index a696ec8..c025d13 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -290,6 +290,10 @@
# /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
+ trigger zygote-start
+
# Load persist properties and override properties (if enabled) from /data.
trigger load_persist_props_action