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

Merge "Reverting code to old flashing code"

Browse source
This commit is contained in:
Treehugger Robot 2023-05-31 21:46:44 +00:00 • committed by Gerrit Code Review
commit 507c5f9476
1 changed files with 2 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
fastboot/fastboot.cpp
View file

@ -1784,28 +1784,8 @@ 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;
}
HardcodedFlash();
return;
}
void FlashAllTool::CheckRequirements() {