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

Commit a552265e authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Fix `fastboot flash-all` on Nexus 7."

parents cb63bed8 6a7ff581

fastboot/fastboot.cpp

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

static void CancelSnapshotIfNeeded() {

    std::string merge_status = "none";

    std::string merge_status = "none";

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

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

        merge_status != "none") {

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

        fb->SnapshotUpdateCommand("cancel");

        fb->SnapshotUpdateCommand("cancel");

    }

    }

}

}