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

Commit 2a56592d authored by Daniel Zheng's avatar Daniel Zheng
Browse files

Reverting code to old flashing code 

Falling back on old flashing code until fastboot-info is fixed

Test: m fastboot, fastboot flashall
Change-Id: I10146ec75f75d57d4a4049d35def370533619401
parent 3c962eee

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)) {