commit b640b8dbb1f3379ad7a5b645e7c040e052f9aafc
author TreeHugger Robot <treehugger-gerrit@google.com> Tue May 14 00:25:22 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 14 00:25:22 2019 +0000
tree cf9b1fda373e30be205ead3f2125d656be89681b
parent 4a61502ef1f70df7223ddb522ce9d0f5cfbacfc8
parent 5420c814b23ded8e32e8138ea14fd1f30d39c7a6

Merge "fs_mgr: overlayfs: ReadFstabFromFile touches errno" into qt-dev

adb/daemon/usb.cpp

diff --git a/adb/daemon/usb.cpp b/adb/daemon/usb.cpp
index 3b29ab5..0fc4512 100644
--- a/adb/daemon/usb.cpp
+++ b/adb/daemon/usb.cpp
@@ -295,9 +295,15 @@
                 }
 
                 struct usb_functionfs_event event;
-                if (TEMP_FAILURE_RETRY(adb_read(control_fd_.get(), &event, sizeof(event))) !=
-                    sizeof(event)) {
+                rc = TEMP_FAILURE_RETRY(adb_read(control_fd_.get(), &event, sizeof(event)));
+                if (rc == -1) {
                     PLOG(FATAL) << "failed to read functionfs event";
+                } else if (rc == 0) {
+                    LOG(WARNING) << "hit EOF on functionfs control fd";
+                    break;
+                } else if (rc != sizeof(event)) {
+                    LOG(FATAL) << "read functionfs event of unexpected size, expected "
+                               << sizeof(event) << ", got " << rc;
                 }
 
                 LOG(INFO) << "USB event: "