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

Commit 1f7ae9d4 authored by Josh Gao's avatar Josh Gao
Browse files

adbd: don't abort on EOF on functionfs control fd. 

Also, improve the logging in the cases where we do abort.

Bug: http://b/131867920
Test: treehugger
Change-Id: If8ec9f4614ce146e6dbd21cc77587ea81658199b
(cherry picked from commit 2916e148)
parent 377a2447

adb/daemon/usb.cpp

+8 −2
Original line number Diff line number Diff line
@@ -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: "