commit 67274bc7a30e2bd060b87b60baf386a058ab86e1
author Treehugger Robot <treehugger-gerrit@google.com> Fri Mar 11 01:10:55 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Mar 11 01:10:55 2022 +0000
tree 6480665dbe9c743bba54298761a994558e0becdc
parent 2e0e0f787820cb2d38c443fe0b355b5e5d567000
parent 22deab0815a8df80eaa54de55072461cb804a8e2

Merge "vdc: remove FDE commands" am: c1b4ce01f8 am: 1d1c8a541c am: 22deab0815

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2021636

Change-Id: I466ef72bb0fae4fa4f10966c4f08982bd2592bb4

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") {