commit b4c9d87c82ac5580ec088b24be7af65d4e98cca4
author Wei Wang <wvw@google.com> Wed Mar 08 22:28:24 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Mar 08 22:28:24 2017 +0000
tree a60ed6be39a65e3c3c647ddd8932c5993728cf72
parent f694c316fbb2543128028ba728235a1a25d30e32
parent a8afa89673e47a01f20d238afd8d18f4c8579b51

Merge "init.rc: add a new zygote-start trigger" am: 4e5e797d26 am: 0d9416ba2e
am: 2980bc1139

Change-Id: I56e6907db4063f6b527be710b00de9200aa8914a

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index 38e759f..f7ac721 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