Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "MtpServer: Pass 0xFFFFFFFF for file size when receiving files >= 4GB in size" into ics-mr0

Browse Source
This commit is contained in:
Mike Lockwood
2011-10-13 08:55:04 -07:00
committed by Android (Google) Code Review
parent 48cf582df3 8334038f9e
commit 0c265c886b
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
media/mtp/MtpServer.cpp
View File

@@ -947,7 +947,12 @@ MtpResponseCode MtpServer::doSendObject() {
if (mSendObjectFileSize - initialData > 0) {
mfr.offset = initialData;
mfr.length = mSendObjectFileSize - initialData;
if (mSendObjectFileSize == 0xFFFFFFFF) {
// tell driver to read until it receives a short packet
mfr.length = 0xFFFFFFFF;
} else {
mfr.length = mSendObjectFileSize - initialData;
}
LOGV("receiving %s\n", (const char *)mSendObjectFilePath);
// transfer the file