Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0c265c88 authored by Mike Lockwood's avatar Mike Lockwood Committed by Android (Google) Code Review
Browse files

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

parents 48cf582d 8334038f

media/mtp/MtpServer.cpp

+6 −1
Original line number Original line Diff line number Diff line
@@ -947,7 +947,12 @@ MtpResponseCode MtpServer::doSendObject() { 




    if (mSendObjectFileSize - initialData > 0) {

    if (mSendObjectFileSize - initialData > 0) {

        mfr.offset = initialData;

        mfr.offset = initialData;

        if (mSendObjectFileSize == 0xFFFFFFFF) {

            // tell driver to read until it receives a short packet

            mfr.length = 0xFFFFFFFF;

        } else {

            mfr.length = mSendObjectFileSize - initialData;

            mfr.length = mSendObjectFileSize - initialData;

        }





        LOGV("receiving %s\n", (const char *)mSendObjectFilePath);

        LOGV("receiving %s\n", (const char *)mSendObjectFilePath);

        // transfer the file

        // transfer the file