Commit 45719a8f authored Mar 02, 2020 by Hridya Valsaraju

fastbootd: use FastbootDevice::GetCurrentSlot to get current slot suffix

Using FastbootDevice::GetCurrentSlot to get the current slot suffix
instead of reading the same from the device's boot control HAL
is required to account for the prior set_active commands issued via
fastbootd in the same boot.

Test: fuzzy_fastboot
--gtest_filter=Conformance.Slots:Conformance.SetActive --gtest_repeat=10
Bug: 146589281

Change-Id: I2edb0f024d93c2483659623423ef5c69c717c7af

parent 335be083

fastboot/device/commands.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -261,7 +261,7 @@ bool SetActiveHandler(FastbootDevice* device, const std::vector<std::string>& ar
		}

		// If the slot is not changing, do nothing.
		if (slot == boot_control_hal->getCurrentSlot()) {
		if (args[1] == device->GetCurrentSlot()) {
		return device->WriteOkay("");
		}