commit a8afa89673e47a01f20d238afd8d18f4c8579b51
author Wei Wang <wvw@google.com> Wed Mar 08 22:25:55 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Mar 08 22:25:55 2017 +0000
tree 90e44d89c185ff2fbe3bf9c45c7bb18d6a188447
parent 11cfa3c8e2dfa4ebcc2214b2fdafe7e4cc5ea5fa
parent ad785194cdde3ff3d43bf6e510c08e9161523de5

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

Change-Id: Ibd8a768b0d76dcd71eb5f8c17528af78074c8ca3

rootdir/init.rc

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