commit 391224c807d2e28e55817b53ff3a30e57d08e996
author Paul Lawrence <paullawrence@google.com> Fri Apr 11 14:55:51 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 11 14:55:52 2014 +0000
tree 1e64d0ac5004a3c37b661923f63a4e5e7e67b134
parent 7bd273e04e77a60598d26a358861568fe11f8efc
parent f24aab7d744b708a897e70e2cbdb76a81bc069b7

Merge "Fix forceencrypt"

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index 79e33ef..d9e4d1c 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -557,7 +557,7 @@
     # encryption) or trigger_restart_min_framework (other encryption)
 
 # One shot invocation to encrypt unencrypted volumes
-service encrypt /system/bin/vdc --wait cryptfs enablecrypto inplace
+service encrypt /system/bin/vdc --wait cryptfs enablecrypto inplace default
     disabled
     oneshot
     # vold will set vold.decrypt to trigger_restart_framework (default