Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 127da2ab authored by Josh Gao's avatar Josh Gao Committed by android-build-merger
Browse files

Merge "adbd: don't abort on EOF on functionfs control fd." am: 41531df7 

am: f848fac6

Change-Id: I9fda92cd15fa84318759a37606429621a0797d36
parents 005b2aa3 f848fac6

adb/daemon/usb.cpp

+8 −2
Original line number Original line Diff line number Diff line
@@ -297,9 +297,15 @@ struct UsbFfsConnection : public Connection { 
                }

                }





                struct usb_functionfs_event event;

                struct usb_functionfs_event event;

                if (TEMP_FAILURE_RETRY(adb_read(control_fd_.get(), &event, sizeof(event))) !=

                rc = TEMP_FAILURE_RETRY(adb_read(control_fd_.get(), &event, sizeof(event)));

                    sizeof(event)) {

                if (rc == -1) {

                    PLOG(FATAL) << "failed to read functionfs event";

                    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: "

                LOG(INFO) << "USB event: "