ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
TreeHugger Robot 2019-05-13 22:21:59 +00:00 • committed by Android (Google) Code Review
commit 82ebfca5cd
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
adb/daemon/usb.cpp
View file

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