Cleaned up some slot logic
Doesn't look like we actually need current_slot, since we can always
just call function get_current_slot
Test: tested flashall on raven
Change-Id: Icba64bc9fdd08f36d44965e32558a73d0beab0e1
diff --git a/fastboot/task.cpp b/fastboot/task.cpp
index 9d4cb75..3d2c975 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 == "all") {
+ if (fp->slot_override == "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, fp->current_slot);
+ auto partition = GetPartitionName(entry);
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, fp->current_slot));
+ return helper->WillFlash(GetPartitionName(entry));
};
os_images.erase(std::remove_if(os_images.begin(), os_images.end(), remove_if_callback),
os_images.end());