commit e0489b7df47fba475a1993b07dbe66026e48ff30
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Dec 16 22:06:03 2019 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Dec 16 22:06:03 2019 +0000
tree 3991f3fd5a0831839eb8f1ce19846ff71f819fd6
parent 470246e20572b7d2312f07204f53229877249177
parent 5253544ceb7ea8a077c3bac4a6c57e7b8693834b

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

Change-Id: Icba7af54e27dd7fe34d3971616e298b441c059cc

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");
     }
 }