ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

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

Change-Id: I5998c10bd130bfae466b4881df61e6a26fe1520c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Daniel Zheng 2023-05-05 20:16:38 +00:00 • committed by Automerger Merge Worker
commit d4ebe0c3a6
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
fastboot/fastboot.cpp
View file

@ -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();