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

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

Merge "Removing should_flash_in_userspace check" am: 437fb0c6 am: a8e0dc01 

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



Change-Id: I118d9bdd5093bb50a4c22c2972de0fa242447c2e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a2412e4e a8e0dc01

fastboot/task.cpp

+3 −5
Original line number Diff line number Diff line
@@ -214,14 +214,12 @@ std::unique_ptr<FlashSuperLayoutTask> FlashSuperLayoutTask::InitializeFromTasks( 


    for (const auto& task : tasks) {

        if (auto flash_task = task->AsFlashTask()) {

            if (should_flash_in_userspace(flash_task->GetPartitionAndSlot())) {

            auto partition = flash_task->GetPartitionAndSlot();

            if (!helper->AddPartition(partition, flash_task->GetImageName(), false)) {

                return nullptr;

            }

        }

    }

    }



    auto s = helper->GetSparseLayout();

    if (!s) return nullptr;