commit 7ee87cfcbef114ef50e15f3f6770cee0fe61890a
author Paul Lawrence <paullawrence@google.com> Fri Dec 22 10:12:06 2017 -0800
committer Paul Lawrence <paullawrence@google.com> Fri Dec 22 11:17:15 2017 -0800
tree 5b563506a5bd6f8e1e704c9659eedc43856304a0
parent 91f1886e14e7fc2b349520d8b5b5777ba5de92f6

Remove all references to FDE enable wipe

Bug: 64766105
Test: FBE boots, forceencrypt boots, set pattern, reboots, encryptable
      boots and can be encrypted
Change-Id: I8c6dc0acdc37c3a6f1bea28d5607ed8938a4eb0c

vdc.cpp

diff --git a/vdc.cpp b/vdc.cpp
index 19eb379..5ae4cd9 100644
--- a/vdc.cpp
+++ b/vdc.cpp
@@ -93,8 +93,7 @@
         checkStatus(vold->initUser0());
     } else if (args[0] == "cryptfs" && args[1] == "enablecrypto") {
         int passwordType = android::os::IVold::PASSWORD_TYPE_DEFAULT;
-        int encryptionFlags = android::os::IVold::ENCRYPTION_FLAG_IN_PLACE
-                | android::os::IVold::ENCRYPTION_FLAG_NO_UI;
+        int encryptionFlags = android::os::IVold::ENCRYPTION_FLAG_NO_UI;
         checkStatus(vold->fdeEnable(passwordType, "", encryptionFlags));
     } else if (args[0] == "cryptfs" && args[1] == "mountdefaultencrypted") {
         checkStatus(vold->mountDefaultEncrypted());