commit 906d774b7d816e5287462b5393221424b0c91ec3
author Josh Gao <jmgao@google.com> Wed Dec 16 14:20:33 2015 -0800
committer android-build-merger <android-build-merger@google.com> Wed Dec 16 14:20:33 2015 -0800
tree 84aa1380138b2448949fdffae3ca79138c831a38
parent d4d4da8f49cd6a46b36a2093de539327348d541d
parent 560b26b70bf768af86797137e4a34aa6bebddbe1

Merge "adb: split up reads longer than 16k." am: 56d7d4e85f
am: bf2c482b56

* commit 'bf2c482b5625d7f0722e85415221a02795cb72ca':
  adb: split up reads longer than 16k.

adb/usb_linux_client.cpp

diff --git a/adb/usb_linux_client.cpp b/adb/usb_linux_client.cpp
index ceed8fa..151c0aa 100644
--- a/adb/usb_linux_client.cpp
+++ b/adb/usb_linux_client.cpp
@@ -481,7 +481,8 @@
 
     char* buf = static_cast<char*>(data);
     while (len > 0) {
-        int n = adb_read(h->bulk_out, buf, len);
+        int read_len = (len > 16384) ? 16384 : len;
+        int n = adb_read(h->bulk_out, buf, read_len);
         if (n < 0) {
             D("ERROR: fd = %d, n = %d: %s", h->bulk_out, n, strerror(errno));
             return -1;