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

Merge "Correcting Reboot Task Functionality" am: dddb5fa80b

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

Change-Id: I9567222ddfd57762492e1671bb598b9f3de07eb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Daniel Zheng 2023-04-10 18:10:44 +00:00 • committed by Automerger Merge Worker
commit c457774df3
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
fastboot/fastboot.cpp
View file

@ -2255,7 +2255,7 @@ int FastBootTool::Main(int argc, char* argv[]) {
if (args.size() == 1) {
std::string reboot_target = next_arg(&args);
reboot_task = std::make_unique<RebootTask>(fp.get(), reboot_target);
} else {
} else if (!fp->skip_reboot) {
reboot_task = std::make_unique<RebootTask>(fp.get());
}
if (!args.empty()) syntax_error("junk after reboot command");
@ -2310,7 +2310,9 @@ int FastBootTool::Main(int argc, char* argv[]) {
} else {
do_flashall(fp.get());
}
reboot_task = std::make_unique<RebootTask>(fp.get());
if (!fp->skip_reboot) {
reboot_task = std::make_unique<RebootTask>(fp.get());
}
} else if (command == "update") {
bool slot_all = (slot_override == "all");
if (slot_all) {
@ -2322,7 +2324,9 @@ int FastBootTool::Main(int argc, char* argv[]) {
filename = next_arg(&args);
}
do_update(filename.c_str(), fp.get());
reboot_task = std::make_unique<RebootTask>(fp.get());
if (!fp->skip_reboot) {
reboot_task = std::make_unique<RebootTask>(fp.get());
}
} else if (command == FB_CMD_SET_ACTIVE) {
std::string slot = verify_slot(next_arg(&args), false);
fb->SetActive(slot);
@ -2411,7 +2415,7 @@ int FastBootTool::Main(int argc, char* argv[]) {
if (fp->wants_set_active) {
fb->SetActive(next_active);
}
if (reboot_task && !fp->skip_reboot) {
if (reboot_task) {
reboot_task->Run();
}
fprintf(stderr, "Finished. Total time: %.3fs\n", (now() - start));