Merge "fastboot: Bring back legacy A/B support" (71a17ff7) · Commits · e / os / android_system_core

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;