commit 3747d8ec383964285a50a58abbf85589f2d29315
author Daichi Hirono <hirono@google.com> Thu Dec 24 08:01:46 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Dec 24 08:01:46 2015 +0000
tree 99efb886c835065b443c3f1c832363bd4fc38755
parent 0d236f5034d20042b105f288c981746bc785ff26
parent a04e6fa61391f1ef64266579760f315c6b3e70b9

Merge "Fix MtpDevice to read 0-byte object correctly."

media/mtp/MtpDevice.cpp

diff --git a/media/mtp/MtpDevice.cpp b/media/mtp/MtpDevice.cpp
index f8b913a..23e432e 100644
--- a/media/mtp/MtpDevice.cpp
+++ b/media/mtp/MtpDevice.cpp
@@ -659,6 +659,13 @@
         return false;
     }
 
+    // If object size 0 byte, the remote device can reply response packet
+    // without sending any data packets.
+    if (mData.getContainerType() == MTP_CONTAINER_TYPE_RESPONSE) {
+        mResponse.copyFrom(mData);
+        return mResponse.getResponseCode() == MTP_RESPONSE_OK;
+    }
+
     const uint32_t fullLength = mData.getContainerLength();
     if ((!expectedLength && fullLength < MTP_CONTAINER_HEADER_SIZE) ||
         (expectedLength && *expectedLength + MTP_CONTAINER_HEADER_SIZE != fullLength)) {