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

Commit 99f360ce authored by Keith Mok's avatar Keith Mok Committed by Automerger Merge Worker
Browse files

Merge "Adding force_flash functionality" into main am: eb216507 am:... 

Merge "Adding force_flash functionality" into main am: eb216507 am: c5e5e488 am: 27e7f6d6 am: a8d94260

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



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

fastboot/task.cpp

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ FlashTask::FlashTask(const std::string& slot, const std::string& pname, const st 


void FlashTask::Run() {

    auto flash = [&](const std::string& partition) {

        if (should_flash_in_userspace(partition) && !is_userspace_fastboot()) {

        if (should_flash_in_userspace(partition) && !is_userspace_fastboot() && !fp_->force_flash) {

            die("The partition you are trying to flash is dynamic, and "

                "should be flashed via fastbootd. Please run:\n"

                "\n"