commit c44825bfe50d22dfbff32ecfa2bff2d8b16d8619
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Dec 16 22:18:23 2019 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Dec 16 22:18:23 2019 +0000
tree 22e3ffcfeeffa6c31f62fa57ab2ed7afe3ce644e
parent d2f27c07923c6df79e7e2939f40662c60cbd373f
parent e0489b7df47fba475a1993b07dbe66026e48ff30

Merge "fastboot: Flashall does proper snapshot cancel" am: 48d3b1e112 am: cb6c6ef123 am: db47d2d068

Change-Id: Iefc7a7e2c0e0789dcd83d9e81cee2fa531d2302b

fastboot/fastboot.cpp

diff --git a/fastboot/fastboot.cpp b/fastboot/fastboot.cpp
index cbd42b1..7fdc28b 100644
--- a/fastboot/fastboot.cpp
+++ b/fastboot/fastboot.cpp
@@ -1226,7 +1226,7 @@
     std::string merge_status = "none";
     if (fb->GetVar(FB_VAR_SNAPSHOT_UPDATE_STATUS, &merge_status) == fastboot::SUCCESS &&
         merge_status != "none") {
-        fb->SnapshotUpdateCommand("Cancel");
+        fb->SnapshotUpdateCommand("cancel");
     }
 }