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

Merge "fastboot: Wait for reboot-fastboot to complete before signaling success."

Browse source
This commit is contained in:
David Anderson 2018-12-08 06:19:52 +00:00 • committed by Gerrit Code Review
commit b81bc9ec00
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
fastboot/fastboot.cpp
View file

@ -1158,6 +1158,10 @@ static void reboot_to_userspace_fastboot() {
std::this_thread::sleep_for(std::chrono::milliseconds(1000)); std::this_thread::sleep_for(std::chrono::milliseconds(1000));
fb->set_transport(open_device()); fb->set_transport(open_device());
if (!is_userspace_fastboot()) {
die("Failed to boot into userspace fastboot; one or more components might be unbootable.");
}
} }
class ImageSource { class ImageSource {
@ -1314,9 +1318,6 @@ void FlashAllTool::UpdateSuperPartition() {
if (!is_userspace_fastboot()) { if (!is_userspace_fastboot()) {
reboot_to_userspace_fastboot(); reboot_to_userspace_fastboot();
} }
if (!is_userspace_fastboot()) {
die("Failed to boot into userspace; one or more components might be unbootable.");
}
std::string super_name; std::string super_name;
if (fb->GetVar("super-partition-name", &super_name) != fastboot::RetCode::SUCCESS) { if (fb->GetVar("super-partition-name", &super_name) != fastboot::RetCode::SUCCESS) {
@ -1962,8 +1963,7 @@ int FastBootTool::Main(int argc, char* argv[]) {
fb->RebootTo("recovery"); fb->RebootTo("recovery");
fb->WaitForDisconnect(); fb->WaitForDisconnect();
} else if (wants_reboot_fastboot) { } else if (wants_reboot_fastboot) {
fb->RebootTo("fastboot"); reboot_to_userspace_fastboot();
fb->WaitForDisconnect();
} }
fprintf(stderr, "Finished. Total time: %.3fs\n", (now() - start)); fprintf(stderr, "Finished. Total time: %.3fs\n", (now() - start));