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

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

Change-Id: I85e1a9a082b2ea711841dff903dcc97bb19edbed
This commit is contained in:
Treehugger Robot 2022-03-11 00:49:45 +00:00 committed by Automerger Merge Worker
commit 22deab0815

View file

@ -116,12 +116,6 @@ int main(int argc, char** argv) {
checkStatus(args, vold->fbeEnable()); checkStatus(args, vold->fbeEnable());
} else if (args[0] == "cryptfs" && args[1] == "init_user0") { } else if (args[0] == "cryptfs" && args[1] == "init_user0") {
checkStatus(args, vold->initUser0()); 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") { } else if (args[0] == "volume" && args[1] == "abort_fuse") {
checkStatus(args, vold->abortFuse()); checkStatus(args, vold->abortFuse());
} else if (args[0] == "volume" && args[1] == "shutdown") { } else if (args[0] == "volume" && args[1] == "shutdown") {