Updating Flashall to work off tasks
Test: testing fastboot flashall on raven
Bug: 194686221
Change-Id: I82ac2392686775b57c3d98ea003ab30b48f1ab0f
diff --git a/fastboot/fastboot.cpp b/fastboot/fastboot.cpp
index 256aeef..0979fd2 100644
--- a/fastboot/fastboot.cpp
+++ b/fastboot/fastboot.cpp
@@ -1588,11 +1588,6 @@
void FlashImages(const std::vector<std::pair<const Image*, std::string>>& images);
void FlashImage(const Image& image, const std::string& slot, fastboot_buffer* buf);
- // If the image uses the default slot, or the user specified "all", then
- // the paired string will be empty. If the image requests a specific slot
- // (for example, system_other) it is specified instead.
- using ImageEntry = std::pair<const Image*, std::string>;
-
std::vector<ImageEntry> boot_images_;
std::vector<ImageEntry> os_images_;
FlashingPlan* fp_;
@@ -1621,15 +1616,15 @@
// or in bootloader fastboot.
FlashImages(boot_images_);
+ std::vector<std::unique_ptr<Task>> tasks;
+
if (auto flash_super_task = FlashSuperLayoutTask::Initialize(fp_, os_images_)) {
- flash_super_task->Run();
+ tasks.emplace_back(std::move(flash_super_task));
} else {
// Sync the super partition. This will reboot to userspace fastboot if needed.
- std::unique_ptr<UpdateSuperTask> update_super_task = std::make_unique<UpdateSuperTask>(fp_);
- update_super_task->Run();
+ tasks.emplace_back(std::make_unique<UpdateSuperTask>(fp_));
// Resize any logical partition to 0, so each partition is reset to 0
// extents, and will achieve more optimal allocation.
- std::vector<std::unique_ptr<ResizeTask>> resize_tasks;
for (const auto& [image, slot] : os_images_) {
// Retrofit devices have two super partitions, named super_a and super_b.
// On these devices, secondary slots must be flashed as physical
@@ -1639,17 +1634,14 @@
std::string partition_name = image->part_name + "_"s + slot;
if (image->IsSecondary() && is_logical(partition_name)) {
fp_->fb->DeletePartition(partition_name);
- std::unique_ptr<DeleteTask> delete_task =
- std::make_unique<DeleteTask>(fp_, partition_name);
- delete_task->Run();
}
+ tasks.emplace_back(std::make_unique<DeleteTask>(fp_, partition_name));
}
- resize_tasks.emplace_back(
- std::make_unique<ResizeTask>(fp_, image->part_name, "0", slot));
+ tasks.emplace_back(std::make_unique<ResizeTask>(fp_, image->part_name, "0", slot));
}
- for (auto& i : resize_tasks) {
- i->Run();
- }
+ }
+ for (auto& task : tasks) {
+ task->Run();
}
FlashImages(os_images_);
}