commit f598e140e94b63204e664ea0bb796671a9a95246
author David Anderson <dvander@google.com> Thu Oct 25 16:11:07 2018 -0700
committer android-build-merger <android-build-merger@google.com> Thu Oct 25 16:11:07 2018 -0700
tree 4b837cfa1d412116927789c317cf597fbad89cce
parent 4aecbd0aac13a67c1fd3e19939a66bca0264a5f3
parent dd85c74655400347aee5f6bfecd827a311f16ca4

Merge "fastboot: Check that reboot to userspace succeeded."
am: dd85c74655

Change-Id: I3f18163b63e0197543d631c717d49f293aa1b905

fastboot/fastboot.cpp

diff --git a/fastboot/fastboot.cpp b/fastboot/fastboot.cpp
index 5101410..81350fd 100644
--- a/fastboot/fastboot.cpp
+++ b/fastboot/fastboot.cpp
@@ -1312,6 +1312,9 @@
     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.");
+    }
     fb->Download("super", fd, get_file_size(fd));
 
     std::string command = "update-super:super";