commit 815b42a2a5c6992ef5e88ce1ee8e7c8fcc2fad29
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Sep 18 22:32:29 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Sep 18 22:32:29 2017 +0000
tree ff40633ab0022f57a3b6c44066c98ed68e2838c7
parent 57b1874505cadea1aef7480ba05ed81686b9c259
parent 7bdf4d5a0f43f4073c87ff794f6efe91aa356b70

Merge "Timeout if device isn't mounted."

vdc.cpp

diff --git a/vdc.cpp b/vdc.cpp
index 3a38641..3335908 100644
--- a/vdc.cpp
+++ b/vdc.cpp
@@ -96,6 +96,8 @@
         int encryptionFlags = android::os::IVold::ENCRYPTION_FLAG_IN_PLACE
                 | android::os::IVold::ENCRYPTION_FLAG_NO_UI;
         exit(vold->fdeEnable(passwordType, "", encryptionFlags).isOk() ? 0 : ENOTTY);
+    } else if (arg1 == "cryptfs" && arg2 == "mountdefaultencrypted") {
+        exit(vold->mountDefaultEncrypted().isOk() ? 0 : ENOTTY);
     } else if (arg1 == "volume" && arg2 == "shutdown") {
         exit(vold->shutdown().isOk() ? 0 : ENOTTY);
     } else {