commit 86bad28329c626dd177e82e1e53d329fde1d3af0
author Nikita Ioffe <ioffe@google.com> Wed Dec 04 11:52:20 2019 -0800
committer android-build-merger <android-build-merger@google.com> Wed Dec 04 11:52:20 2019 -0800
tree 6b945c06f00c5cf6fbd6b12bf0856f78a47508bb
parent 9f5f518c19034d95d955732ba3c7aafc7af366b5
parent d21a8a495d6af2a7d67d8447026b8dbb72c7e125

Merge "Add '/system/bin/vdc volume reset' command"
am: d21a8a495d

Change-Id: I21fde79cd170bdfcd8a32b8a85da56099a223e2d

vdc.cpp

diff --git a/vdc.cpp b/vdc.cpp
index c1b7781..a6a3fb0 100644
--- a/vdc.cpp
+++ b/vdc.cpp
@@ -101,6 +101,8 @@
         checkStatus(args, vold->mountDefaultEncrypted());
     } else if (args[0] == "volume" && args[1] == "shutdown") {
         checkStatus(args, vold->shutdown());
+    } else if (args[0] == "volume" && args[1] == "reset") {
+        checkStatus(args, vold->reset());
     } else if (args[0] == "cryptfs" && args[1] == "checkEncryption" && args.size() == 3) {
         checkStatus(args, vold->checkEncryption(args[2]));
     } else if (args[0] == "cryptfs" && args[1] == "mountFstab" && args.size() == 4) {
@@ -111,7 +113,8 @@
         bool supported = false;
         checkStatus(args, vold->supportsCheckpoint(&supported));
         return supported ? 1 : 0;
-    } else if (args[0] == "checkpoint" && args[1] == "supportsBlockCheckpoint" && args.size() == 2) {
+    } else if (args[0] == "checkpoint" && args[1] == "supportsBlockCheckpoint" &&
+               args.size() == 2) {
         bool supported = false;
         checkStatus(args, vold->supportsBlockCheckpoint(&supported));
         return supported ? 1 : 0;