commit 80d1ca5600807b5b9add6dee052719d52ca8c0df
author Daniel Rosenberg <drosen@google.com> Tue Oct 09 19:26:57 2018 -0700
committer Daniel Rosenberg <drosen@google.com> Mon Oct 15 22:13:41 2018 +0000
tree 2dbe844a960eca1568de942a06cc5b2016a8558a
parent ba1752008dd3f5f83e6b79c3bf9a6df325fd807c

Handle retry count

Test: vdc setCheckpoint 2 then reboot 3 times checking state
Bug: 112901762
Change-Id: I85a71d059bca27b76175b9bd8465cc453f0ddb8d

vdc.cpp

diff --git a/vdc.cpp b/vdc.cpp
index 5e2c37a..6efd72c 100644
--- a/vdc.cpp
+++ b/vdc.cpp
@@ -123,10 +123,9 @@
         bool success = false;
         checkStatus(vold->commitChanges(&success));
         return success ? 1 : 0;
-    } else if (args[0] == "checkpoint" && args[1] == "prepareDriveForCheckpoint" &&
-               args.size() == 3) {
+    } else if (args[0] == "checkpoint" && args[1] == "prepareCheckpoint" && args.size() == 2) {
         bool success = false;
-        checkStatus(vold->prepareDriveForCheckpoint(args[2], &success));
+        checkStatus(vold->prepareCheckpoint(&success));
         return success ? 1 : 0;
     } else if (args[0] == "checkpoint" && args[1] == "restoreCheckpoint" && args.size() == 3) {
         bool success = false;