commit 5774f8288ce7ef3d1044e8eeaaa9acb9859b57de
author Treehugger Robot <treehugger-gerrit@google.com> Mon Mar 01 21:49:18 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Mar 01 21:49:18 2021 +0000
tree cf84584b4605e0b27957b913fb29d9105940c7ef
parent d8ea8267c7b44ccc7c15a3c506464b5189410b15
parent 71a17ff717307e93a0400bc3cdde33050e08dfa7

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7a9a1cd5bbd13200ecfa5c5d66659aedfece0e31

fastboot/fastboot.cpp

diff --git a/fastboot/fastboot.cpp b/fastboot/fastboot.cpp
index f7edf8e..38be934 100644
--- a/fastboot/fastboot.cpp
+++ b/fastboot/fastboot.cpp
@@ -1103,6 +1103,7 @@
 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 @@
             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;