summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreehugger Robot2018-07-30 18:40:36 -0500
committerGerrit Code Review2018-07-30 18:40:36 -0500
commitd0d7d0a6b92221fcfb1ae772f7ae88280d5e3f6e (patch)
tree80dd436830834f04094e2725bc6b6bd33ce796d1
parentf2878cf15b0c82f22298919b022623340bed0405 (diff)
parent0c7bde8de630f1668cf554e14641bffd56617e1e (diff)
downloadplatform-system-core-d0d7d0a6b92221fcfb1ae772f7ae88280d5e3f6e.tar.gz
platform-system-core-d0d7d0a6b92221fcfb1ae772f7ae88280d5e3f6e.tar.xz
platform-system-core-d0d7d0a6b92221fcfb1ae772f7ae88280d5e3f6e.zip
Merge "fastboot: Fix hang when sparse images end in small chunks."android-n-iot-release-smart-display-r2
-rw-r--r--fastboot/fastboot_driver.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/fastboot/fastboot_driver.cpp b/fastboot/fastboot_driver.cpp
index c30842055..aabc620d4 100644
--- a/fastboot/fastboot_driver.cpp
+++ b/fastboot/fastboot_driver.cpp
@@ -462,6 +462,10 @@ RetCode FastBootDriver::SendBuffer(const std::vector<char>& buf) {
462} 462}
463 463
464RetCode FastBootDriver::SendBuffer(const void* buf, size_t size) { 464RetCode FastBootDriver::SendBuffer(const void* buf, size_t size) {
465 if (!size) {
466 return SUCCESS;
467 }
468
465 // Write the buffer 469 // Write the buffer
466 ssize_t tmp = transport->Write(buf, size); 470 ssize_t tmp = transport->Write(buf, size);
467 471