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

Commit 2775df61 authored by Daniel Zheng's avatar Daniel Zheng
Browse files

Removing should_flash_in_userspace check 

This check isn't needed as super_flash_helper.cpp calls a different
should_flash_in_userspace that isn't reliant on $ANDROID_PRODUCT_OUT
being set. Current code will fail when calling fastboot update

Test: fastboot update update.zip without calling lunch
Bug: 283330320
Change-Id: Icefe6092befb747b7f419ea997e0834602808d69
parent 791a83bb

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;