From 2bf87eebe4dd4de23f3dac5d33f8fea4218bd035 Mon Sep 17 00:00:00 2001
From: Paul Lawrence <paullawrence@google.com>
Date: Tue, 25 Apr 2017 09:00:22 -0700
Subject: [PATCH] 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
---
 rootdir/init.rc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/rootdir/init.rc b/rootdir/init.rc
index 15fce903c..52dbec98c 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -272,6 +272,7 @@ 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
@@ -618,6 +619,7 @@ on boot
     class_start core
 
 on nonencrypted
+    trigger later-init
     class_start main
     class_start late_start
 
@@ -636,7 +638,7 @@ on property:vold.decrypt=trigger_load_persist_props
     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.