Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ca7ffe1 authored by Daniel Zheng's avatar Daniel Zheng Committed by Automerger Merge Worker
Browse files

Merge "Added support for Update Super Task" am: db94b51c am: 7256acc6 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2469300



Change-Id: I81526a2a3dee858b715ad8ec1b54f76ca192d807
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 550d1008 7256acc6

fastboot/fastboot.cpp

+2 −37
Original line number Diff line number Diff line
@@ -1587,7 +1587,6 @@ class FlashAllTool { 
    void CollectImages();

    void FlashImages(const std::vector<std::pair<const Image*, std::string>>& images);

    void FlashImage(const Image& image, const std::string& slot, fastboot_buffer* buf);

    void UpdateSuperPartition();



    // 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
@@ -1628,7 +1627,8 @@ void FlashAllTool::Flash() { 
        flash_super_task->Run();

    } else {

        // Sync the super partition. This will reboot to userspace fastboot if needed.

        UpdateSuperPartition();

        std::unique_ptr<UpdateSuperTask> update_super_task = std::make_unique<UpdateSuperTask>(fp_);

        update_super_task->Run();

        // Resize any logical partition to 0, so each partition is reset to 0

        // extents, and will achieve more optimal allocation.

        for (const auto& [image, slot] : os_images_) {
@@ -1721,41 +1721,6 @@ void FlashAllTool::FlashImage(const Image& image, const std::string& slot, fastb 
    do_for_partitions(image.part_name, slot, flash, false);

}



void FlashAllTool::UpdateSuperPartition() {

    unique_fd fd = fp_->source->OpenFile("super_empty.img");

    if (fd < 0) {

        return;

    }

    if (!is_userspace_fastboot()) {

        reboot_to_userspace_fastboot();

    }



    std::string super_name;

    if (fb->GetVar("super-partition-name", &super_name) != fastboot::RetCode::SUCCESS) {

        super_name = "super";

    }

    fb->Download(super_name, fd, get_file_size(fd));



    std::string command = "update-super:" + super_name;

    if (fp_->wants_wipe) {

        command += ":wipe";

    }

    fb->RawCommand(command, "Updating super partition");



    // Retrofit devices have two super partitions, named super_a and super_b.

    // On these devices, secondary slots must be flashed as physical

    // partitions (otherwise they would not mount on first boot). To enforce

    // this, we delete any logical partitions for the "other" slot.

    if (is_retrofit_device()) {

        for (const auto& [image, slot] : os_images_) {

            std::string partition_name = image->part_name + "_"s + slot;

            if (image->IsSecondary() && is_logical(partition_name)) {

                fb->DeletePartition(partition_name);

            }

        }

    }

}



class ZipImageSource final : public ImageSource {

  public:

    explicit ZipImageSource(ZipArchiveHandle zip) : zip_(zip) {}

fastboot/task.cpp

+25 −0
Original line number Diff line number Diff line
@@ -142,3 +142,28 @@ std::unique_ptr<FlashSuperLayoutTask> FlashSuperLayoutTask::Initialize( 
                    os_images.end());

    return std::make_unique<FlashSuperLayoutTask>(super_name, std::move(helper), std::move(s));

}



UpdateSuperTask::UpdateSuperTask(FlashingPlan* fp)

    : fp_(fp) {}



void UpdateSuperTask::Run() {

    unique_fd fd = fp_->source->OpenFile("super_empty.img");

    if (fd < 0) {

        return;

    }

    if (!is_userspace_fastboot()) {

        reboot_to_userspace_fastboot();

    }



    std::string super_name;

    if (fp_->fb->GetVar("super-partition-name", &super_name) != fastboot::RetCode::SUCCESS) {

        super_name = "super";

    }

    fp_->fb->Download(super_name, fd, get_file_size(fd));



    std::string command = "update-super:" + super_name;

    if (fp_->wants_wipe) {

        command += ":wipe";

    }

    fp_->fb->RawCommand(command, "Updating super partition");

}

fastboot/task.h

+9 −0
Original line number Diff line number Diff line
@@ -70,3 +70,12 @@ class FlashSuperLayoutTask : public Task { 
    std::unique_ptr<SuperFlashHelper> helper_;

    SparsePtr sparse_layout_;

};



class UpdateSuperTask : public Task {

  public:

    UpdateSuperTask(FlashingPlan* fp);

    void Run() override;



  private:

    FlashingPlan* fp_;

};