Enable metadata encryption
Bug: 26778031
Test: Boots, reboots, sector 0 of userdata encrypted
Make sure an FDE device, both default and password protected,
boots.
Make sure an FBE device without metadata encryption boots.
Change-Id: I55135f2d81002f4010a857c021ee840f792f7917
diff --git a/rootdir/init.rc b/rootdir/init.rc
index 15fce90..52dbec9 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
@@ -618,6 +619,7 @@
class_start core
on nonencrypted
+ trigger later-init
class_start main
class_start late_start
@@ -636,7 +638,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.