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

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

Merge "Fail on fastboot-info.txt format error" am: f47f3f75 am: d4ebe0c3 

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



Change-Id: If8812da74f72538f7c293ca268f77dc704e8f0a8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 41c91382 d4ebe0c3

fastboot/fastboot.cpp

+6 −6
Original line number Diff line number Diff line
@@ -1724,8 +1724,6 @@ std::vector<std::unique_ptr<Task>> ParseFastbootInfo(const FlashingPlan* fp, 
        }

        auto task = ParseFastbootInfoLine(fp, command);

        if (!task) {

            LOG(ERROR) << "Error when parsing fastboot-info.txt, falling back on Hardcoded list: "

                       << text;

            return {};

        }

        tasks.emplace_back(std::move(task));
@@ -1751,8 +1749,6 @@ std::vector<std::unique_ptr<Task>> ParseFastbootInfo(const FlashingPlan* fp, 
}



std::vector<std::unique_ptr<Task>> ParseFastbootInfo(const FlashingPlan* fp, std::ifstream& fs) {

    if (!fs || fs.eof()) return {};



    std::string text;

    std::vector<std::string> file;

    // Get os_partitions that need to be resized
@@ -1783,13 +1779,17 @@ void FlashAllTool::Flash() { 


    std::string path = find_item_given_name("fastboot-info.txt");

    std::ifstream stream(path);

    std::vector<std::unique_ptr<Task>> tasks = ParseFastbootInfo(fp_, stream);

    if (tasks.empty()) {

    if (!stream || stream.eof()) {

        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_, stream);

    if (tasks.empty()) {

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

    }

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

    for (auto& task : tasks) {

        task->Run();