commit c1b4ce01f8dd4addd7a250ca481b20ed1a5d854d
author Treehugger Robot <treehugger-gerrit@google.com> Fri Mar 11 00:03:48 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Mar 11 00:03:48 2022 +0000
tree 7c7c3c2864229fb6786e59ea983b2c73fc10cabf
parent 536beac4bd4c45808969dc230c73f228003e7c33
parent b140eba44d0ed550a8664eb2a59c189f30f2944d

Merge "vdc: remove FDE commands"

vdc.cpp

diff --git a/vdc.cpp b/vdc.cpp
index 313ef55..740e246 100644
--- a/vdc.cpp
+++ b/vdc.cpp
@@ -116,12 +116,6 @@
         checkStatus(args, vold->fbeEnable());
     } else if (args[0] == "cryptfs" && args[1] == "init_user0") {
         checkStatus(args, 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_NO_UI;
-        checkStatus(args, vold->fdeEnable(passwordType, "", encryptionFlags));
-    } else if (args[0] == "cryptfs" && args[1] == "mountdefaultencrypted") {
-        checkStatus(args, vold->mountDefaultEncrypted());
     } else if (args[0] == "volume" && args[1] == "abort_fuse") {
         checkStatus(args, vold->abortFuse());
     } else if (args[0] == "volume" && args[1] == "shutdown") {