Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a2a79218 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix `fastboot flash-all` on Nexus 7." am: a552265e am: 5ada180b 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1324873

Change-Id: Id75eb2d82073c663ec5cd5b9661e12a358a48ef1
parents 20570fa2 5ada180b

fastboot/fastboot.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1229,7 +1229,7 @@ static void reboot_to_userspace_fastboot() { 
static void CancelSnapshotIfNeeded() {

    std::string merge_status = "none";

    if (fb->GetVar(FB_VAR_SNAPSHOT_UPDATE_STATUS, &merge_status) == fastboot::SUCCESS &&

        merge_status != "none") {

        !merge_status.empty() && merge_status != "none") {

        fb->SnapshotUpdateCommand("cancel");

    }

}