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

Commit 61a91323 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Reverting code to old flashing code" am: 507c5f94 am: fb32e6be 

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



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

fastboot/fastboot.cpp

+2 −22
Original line number Diff line number Diff line
@@ -1784,30 +1784,10 @@ void FlashAllTool::Flash() { 


    CancelSnapshotIfNeeded();



    std::vector<char> contents;

    if (!fp_->source->ReadFile("fastboot-info.txt", &contents)) {

        LOG(VERBOSE) << "Flashing from hardcoded images. fastboot-info.txt is empty or does not "

                        "exist";

    HardcodedFlash();

    return;

}



    std::vector<std::unique_ptr<Task>> tasks =

            ParseFastbootInfo(fp_, Split({contents.data(), contents.size()}, "\n"));



    if (tasks.empty()) {

        LOG(FATAL) << "Invalid fastboot-info.txt file.";

    }

    LOG(VERBOSE) << "Flashing from fastboot-info.txt";

    for (auto& task : tasks) {

        task->Run();

    }

    if (fp_->wants_wipe) {

        // avoid adding duplicate wipe tasks in fastboot main code.

        fp_->wants_wipe = false;

    }

}



void FlashAllTool::CheckRequirements() {

    std::vector<char> contents;

    if (!fp_->source->ReadFile("android-info.txt", &contents)) {