Commit: 82ebfca5cdaefaeaae95a5fe641bdf594b6ac2cd - system-core (git)

system/core

Commit MetaInfo

• Revision: 82ebfca5cdaefaeaae95a5fe641bdf594b6ac2cd (tree)
• Zeit: 2019-05-14 07:21:59
• Autor: TreeHugger Robot <treehugger-gerrit@goog...>
• Commiter: Android (Google) Code Review

Log Message

Merge "adbd: don't abort on EOF on functionfs control fd." into qt-dev

Ändern Zusammenfassung

• modified: adb/daemon/usb.cpp

Diff

--- a/adb/daemon/usb.cpp
+++ b/adb/daemon/usb.cpp
@@ -295,9 +295,15 @@ struct UsbFfsConnection : public Connection {
                 }
 
                 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: "