Revert "Enable metadata encryption"
Bug: 37792477
This reverts commit 2bf87eebe4dd4de23f3dac5d33f8fea4218bd035.
Change-Id: I1a43793beda24c01f0fe9e25a7c183af1200fa76
diff --git a/rootdir/init.rc b/rootdir/init.rc
index 52dbec9..15fce90 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -272,7 +272,6 @@
# 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,7 +618,6 @@
class_start core
on nonencrypted
- trigger later-init
class_start main
class_start late_start
@@ -638,7 +636,7 @@
start logd-reinit
on property:vold.decrypt=trigger_post_fs_data
- trigger later-init
+ trigger post-fs-data
on property:vold.decrypt=trigger_restart_min_framework
# A/B update verifier that marks a successful boot.