tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
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
This commit is contained in:
Hridya Valsaraju 2020-03-02 13:03:47 -08:00
parent 335be083e1
commit 45719a8f07
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fastboot/device/commands.cpp
View file

@ -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("");
}