commit 2a4a45f3e45471ec2b25b47a42cbbd08434b85b4
author Kelvin Zhang <zhangkelvin@google.com> Mon Apr 03 20:44:05 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Apr 03 20:44:05 2023 +0000
tree 56bf72b7aeb90bc20e21a55415ed928025701ecf
parent bd85a18d0bcdd3041357c846905c737f10732320

Revert "Cleaned up some slot logic"

This reverts commit bd85a18d0bcdd3041357c846905c737f10732320.

Reason for revert: b/276759363

Change-Id: I3ba08cf4abeeb7769569512d50e7ff135438cf20

fastboot/task.cpp

diff --git a/fastboot/task.cpp b/fastboot/task.cpp
index 3d2c975..9d4cb75 100644
--- a/fastboot/task.cpp
+++ b/fastboot/task.cpp
@@ -95,7 +95,7 @@
         LOG(VERBOSE) << "Cannot optimize flashing super on non-AB device";
         return nullptr;
     }
-    if (fp->slot_override == "all") {
+    if (fp->slot == "all") {
         LOG(VERBOSE) << "Cannot optimize flashing super for all slots";
         return nullptr;
     }
@@ -132,7 +132,7 @@
     }
 
     for (const auto& entry : os_images) {
-        auto partition = GetPartitionName(entry);
+        auto partition = GetPartitionName(entry, fp->current_slot);
         auto image = entry.first;
 
         if (!helper->AddPartition(partition, image->img_name, image->optional_if_no_image)) {
@@ -145,7 +145,7 @@
 
     // Remove images that we already flashed, just in case we have non-dynamic OS images.
     auto remove_if_callback = [&](const ImageEntry& entry) -> bool {
-        return helper->WillFlash(GetPartitionName(entry));
+        return helper->WillFlash(GetPartitionName(entry, fp->current_slot));
     };
     os_images.erase(std::remove_if(os_images.begin(), os_images.end(), remove_if_callback),
                     os_images.end());