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

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

Merge "fastboot: Bring back legacy A/B support" am: 71a17ff7 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7a9a1cd5bbd13200ecfa5c5d66659aedfece0e31
parents d8ea8267 71a17ff7

fastboot/fastboot.cpp

+2 −0
Original line number Diff line number Diff line
@@ -1103,6 +1103,7 @@ static void flash_buf(const std::string& partition, struct fastboot_buffer *buf) 
static std::string get_current_slot() {

    std::string current_slot;

    if (fb->GetVar("current-slot", &current_slot) != fastboot::SUCCESS) return "";

    if (current_slot[0] == '_') current_slot.erase(0, 1);

    return current_slot;

}
@@ -1950,6 +1951,7 @@ int FastBootTool::Main(int argc, char* argv[]) { 
            if (slot_override == "") {

                std::string current_slot;

                if (fb->GetVar("current-slot", &current_slot) == fastboot::SUCCESS) {

                    if (current_slot[0] == '_') current_slot.erase(0, 1);

                    next_active = verify_slot(current_slot, false);

                } else {

                    wants_set_active = false;