Merge "Enable metadata encryption"
diff --git a/rootdir/init.rc b/rootdir/init.rc
index def686b..9228290 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -272,6 +272,7 @@
# some services can be started.
trigger late-fs
+on later-init
# Now we can mount /data. File encryption requires keymaster to decrypt
# /data, which in turn can only be loaded when system properties are present.
trigger post-fs-data
@@ -619,6 +620,7 @@
class_start core
on nonencrypted
+ trigger later-init
class_start main
class_start late_start
@@ -637,7 +639,7 @@
start logd-reinit
on property:vold.decrypt=trigger_post_fs_data
- trigger post-fs-data
+ trigger later-init
on property:vold.decrypt=trigger_restart_min_framework
# A/B update verifier that marks a successful boot.