From 9709c5a7ff7446f2faac53df5ab45b9bc002b9fa Mon Sep 17 00:00:00 2001 From: Guang Zhu Date: Fri, 28 Apr 2017 23:56:48 +0000 Subject: [PATCH] Revert "Enable metadata encryption" Bug: 37792477 This reverts commit 2bf87eebe4dd4de23f3dac5d33f8fea4218bd035. Change-Id: I1a43793beda24c01f0fe9e25a7c183af1200fa76 --- rootdir/init.rc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/rootdir/init.rc b/rootdir/init.rc index 52dbec98c..15fce903c 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -272,7 +272,6 @@ on late-init # 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 @@ on boot class_start core on nonencrypted - trigger later-init class_start main class_start late_start @@ -638,7 +636,7 @@ on property:vold.decrypt=trigger_load_persist_props 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.