summaryrefslogtreecommitdiffstats
path: root/fastboot
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2019-05-29 23:11:55 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-05-29 23:11:55 +0000
commit9122289a9729de5dbdba89700dda140dd0e11966 (patch)
tree565e2a286277657503cfe21e6de9ff9b6f080141 /fastboot
parentd1531ac4e8dc8f57eddf06f1b4a9a93ca67a8ae0 (diff)
parent5f8b966d960ff9cb403a167768c48c2aa4d76710 (diff)
downloadsystem_core-9122289a9729de5dbdba89700dda140dd0e11966.tar.gz
system_core-9122289a9729de5dbdba89700dda140dd0e11966.tar.bz2
system_core-9122289a9729de5dbdba89700dda140dd0e11966.zip
Merge "Fix non-aio USB read issue for fastbootd" into qt-dev
Diffstat (limited to 'fastboot')
-rw-r--r--fastboot/device/usb_client.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/fastboot/device/usb_client.cpp b/fastboot/device/usb_client.cpp
index 775d10c80..101429134 100644
--- a/fastboot/device/usb_client.cpp
+++ b/fastboot/device/usb_client.cpp
@@ -255,7 +255,8 @@ ssize_t ClientUsbTransport::Read(void* data, size_t len) {
size_t bytes_read_total = 0;
while (bytes_read_total < len) {
auto bytes_to_read = std::min(len - bytes_read_total, kFbFfsNumBufs * kFbFfsBufSize);
- auto bytes_read_now = handle_->read(handle_.get(), char_data, bytes_to_read);
+ auto bytes_read_now =
+ handle_->read(handle_.get(), char_data, bytes_to_read, true /* allow_partial */);
if (bytes_read_now < 0) {
return bytes_read_total;
}