Merge "fastboot: Wait for reboot-fastboot to complete before signaling success." (b81bc9ec) · Commits · e / os / android_system_core

fastboot/fastboot.cpp

+5 −5

Original line number	Diff line number	Diff line
		@@ -1158,6 +1158,10 @@ static void reboot_to_userspace_fastboot() {
		std::this_thread::sleep_for(std::chrono::milliseconds(1000));

		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 {
		@@ -1314,9 +1318,6 @@ void FlashAllTool::UpdateSuperPartition() {
		if (!is_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;
		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->WaitForDisconnect();
		} else if (wants_reboot_fastboot) {
		fb->RebootTo("fastboot");
		fb->WaitForDisconnect();
		reboot_to_userspace_fastboot();
		}

		fprintf(stderr, "Finished. Total time: %.3fs\n", (now() - start));