Merge "fastbootd: use FastbootDevice::GetCurrentSlot to get current slot suffix" am: 220b6ebd05

Change-Id: I498a98bc3e2d3c2b0bbba70763bcf9bd1d489704
2020-03-03 12:20:41 +00:00 · 2020-03-03 12:20:41 +00:00 · 51230e4acf
parent 025b239f1e 220b6ebd05
commit 51230e4acf
1 changed files with 1 additions and 1 deletions
--- a/fastboot/device/commands.cpp
+++ b/fastboot/device/commands.cpp
@ -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("");
    }