commit fab6ebafa693989a629ec9c662f0ed0668c2c42d
author JP Abgrall <jpa@google.com> Wed Jun 25 00:28:50 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Jun 25 00:28:50 2014 +0000
tree aa606b09ea867ee7d06c057003cdbb26b29545f6
parent f530c93c4aab818de51fd7123199bef6621047f8
parent 4705044243225ffde88910154485a84c27a33709

am 47050442: am 31132182: am 07703339: Merge "Wait for device to disappear after "fastboot reboot"."

* commit '4705044243225ffde88910154485a84c27a33709':
  Wait for device to disappear after "fastboot reboot".

fastboot/fastboot.c

diff --git a/fastboot/fastboot.c b/fastboot/fastboot.c
index 2bf0c48..64a52b5 100644
--- a/fastboot/fastboot.c
+++ b/fastboot/fastboot.c
@@ -1219,6 +1219,7 @@
     }
     if (wants_reboot) {
         fb_queue_reboot();
+        fb_queue_wait_for_disconnect();
     } else if (wants_reboot_bootloader) {
         fb_queue_command("reboot-bootloader", "rebooting into bootloader");
         fb_queue_wait_for_disconnect();