Revert "Ensure update_verifier run before zygote"
This reverts commit 5dc05effecca88f06da090dbcdd257666e69c2c7.
Change-Id: Ic041860dee8a2993c6b4890beca4da745cfbfb60
diff --git a/rootdir/init.rc b/rootdir/init.rc
index 2dd5771..e51a3e3 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -495,28 +495,13 @@
# Set indication (checked by vold) that we have finished this action
#setprop vold.post_fs_data_done 1
-# It is recommended to put unnecessary data/ initialization from post-fs-data
-# to start-zygote in device's init.rc to unblock zygote start.
-on zygote-start && property:ro.crypto.state=unencrypted
- # A/B update verifier that marks a successful boot.
- exec_start update_verifier_nonencrypted
- start netd
- start zygote
- start zygote_secondary
-
-on zygote-start && property:ro.crypto.state=unsupported
- # A/B update verifier that marks a successful boot.
- exec_start update_verifier_nonencrypted
- start netd
- start zygote
- start zygote_secondary
-
+# This trigger will be triggered before 'zygote-start' since there is no zygote-start defined in
+# current init.rc. It is recommended to put unnecessary data/ initialization from post-fs-data
+# to start-zygote to unblock zygote start.
on zygote-start && property:ro.crypto.state=encrypted && property:ro.crypto.type=file
- # A/B update verifier that marks a successful boot.
- exec_start update_verifier_nonencrypted
- start netd
- start zygote
- start zygote_secondary
+ start netd
+ start zygote
+ start zygote_secondary
on boot
# basic network init
@@ -615,6 +600,8 @@
class_start core
on nonencrypted
+ # A/B update verifier that marks a successful boot.
+ exec_start update_verifier_nonencrypted
class_start main
class_start late_start