diff options
| author | Mike Lockwood <lockwood@android.com> | 2011-03-14 09:43:14 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-03-14 09:43:14 -0700 |
| commit | 3ec9d06f070db3a8899ad235736abd0ffaf6f578 (patch) | |
| tree | 0ec88d00bc2e3f2d29c36e20b2115abd87d87375 | |
| parent | 7ea3c7f5a31dcc40d3b5042e3eb724916b66384e (diff) | |
| parent | 90f5d75cf0502788fbc2fb49f366de40d5ffc164 (diff) | |
| download | frameworks_base-3ec9d06f070db3a8899ad235736abd0ffaf6f578.zip frameworks_base-3ec9d06f070db3a8899ad235736abd0ffaf6f578.tar.gz frameworks_base-3ec9d06f070db3a8899ad235736abd0ffaf6f578.tar.bz2 | |
Merge "MtpDevice: Handle zero length packets in readResponse()" into honeycomb-mr1
| -rw-r--r-- | media/mtp/MtpDevice.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/media/mtp/MtpDevice.cpp b/media/mtp/MtpDevice.cpp index 4ea8849..2e86159 100644 --- a/media/mtp/MtpDevice.cpp +++ b/media/mtp/MtpDevice.cpp @@ -819,6 +819,10 @@ MtpResponseCode MtpDevice::readResponse() { return mResponse.getResponseCode(); } int ret = mResponse.read(mRequestIn1); + // handle zero length packets, which might occur if the data transfer + // ends on a packet boundary + if (ret == 0) + ret = mResponse.read(mRequestIn1); if (ret >= MTP_CONTAINER_HEADER_SIZE) { mResponse.dump(); return mResponse.getResponseCode(); |