Revert "Securely encrypt the master key"
This reverts commit 4bf1887c787a025aad2fbafe382e556e85ac73b0.
Change-Id: Ie6d1f39de530b99b50a27ddc45bcc900a24e04b5
diff --git a/rootdir/init.rc b/rootdir/init.rc
index b353d9d..a5ea60a 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -226,17 +226,14 @@
mkdir /cache/lost+found 0770 root root
on post-fs-data
+ installkey /data
+
# We chown/chmod /data again so because mount is run as root + defaults
chown system system /data
chmod 0771 /data
# We restorecon /data in case the userdata partition has been reset.
restorecon /data
- # Make sure we have the device encryption key
- start logd
- start vold
- installkey /data
-
# Start bootcharting as soon as possible after the data partition is
# mounted to collect more data.
mkdir /data/bootchart 0755 shell shell
@@ -457,6 +454,7 @@
class_start main
on property:vold.decrypt=trigger_restart_framework
+ installkey /data
class_start main
class_start late_start