commit bda6272446454886339841a62daaa1b66c07ad60
author Paul Lawrence <paullawrence@google.com> Wed Jan 21 09:57:01 2015 -0800
committer Paul Lawrence <paullawrence@google.com> Wed Jan 21 10:03:29 2015 -0800
tree 62853a7f9d46dea01fb29d50da39fe7f4608579c
parent 70f6dea9d06876bc65181c40ee9e623be196fb4c

Make encryption configurable

Delay mounting encryptable but unencrypted volumes until we can
check the ro.vold.forceencrypt flag, then optionally encrypt.

Requires matching vold change from
    https://googleplex-android-review.git.corp.google.com/#/c/615309/

Bug: 18764230
Change-Id: If22008be8de6a4f3216b349f81ace49be1730314

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index cbcb842..e90acee 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -572,7 +572,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 default
+service encrypt /system/bin/vdc --wait cryptfs maybeenabledefaultcrypto
     disabled
     oneshot
     # vold will set vold.decrypt to trigger_restart_framework (default