commit 560b26b70bf768af86797137e4a34aa6bebddbe1
author Josh Gao <jmgao@google.com> Wed Dec 16 21:02:50 2015 +0000
committer android-build-merger <android-build-merger@google.com> Wed Dec 16 21:02:50 2015 +0000
tree 59f694ffb807eb7ec703bc8363f641d3739999c3
parent 82a62af6ee93c5a697d7be55f6f186af4ea73476
parent 1692fddebae9285458551409eab87b201db08072

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

* commit '56d7d4e85f41ddeea5ca256e5a9c05f73b2f40f0':
  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;