Commit: 8ef22b102ce2eaa5668adc2631ad24017777d610 - system-core (git)

system/core

Commit MetaInfo

• Revision: 8ef22b102ce2eaa5668adc2631ad24017777d610 (tree)
• Zeit: 2019-05-23 06:06:56
• Autor: Josh Gao <jmgao@goog...>
• Commiter: Android (Google) Code Review

Log Message

Merge "adbd: respond to device-to-host control transfers." into qt-dev

Ändern Zusammenfassung

• modified: adb/daemon/usb.cpp

Diff

--- a/adb/daemon/usb.cpp
+++ b/adb/daemon/usb.cpp
@@ -380,7 +380,12 @@ struct UsbFfsConnection : public Connection {
                                   << ", wLength = " << static_cast<int>(event.u.setup.wLength);
 
                         if ((event.u.setup.bRequestType & USB_DIR_IN)) {
-                            LOG(WARNING) << "received a device-to-host control transfer, ignoring";
+                            LOG(INFO) << "acking device-to-host control transfer";
+                            ssize_t rc = adb_write(control_fd_.get(), "", 0);
+                            if (rc != 0) {
+                                PLOG(ERROR) << "failed to write empty packet to host";
+                                break;
+                            }
                         } else {
                             std::string buf;
                             buf.resize(event.u.setup.wLength + 1);