Merge "fastboot: Bring back legacy A/B support"
This commit is contained in:
commit
71a17ff717
1 changed files with 2 additions and 0 deletions
|
|
@ -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", ¤t_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", ¤t_slot) == fastboot::SUCCESS) {
|
||||
if (current_slot[0] == '_') current_slot.erase(0, 1);
|
||||
next_active = verify_slot(current_slot, false);
|
||||
} else {
|
||||
wants_set_active = false;
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue