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

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

Merge "MTP host: Fix problems reading large data packets" into honeycomb-mr1

parents 767d7a03 bcc0516b

media/mtp/MtpDataPacket.cpp

+3 −3
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
namespace android {



MtpDataPacket::MtpDataPacket()

    :   MtpPacket(512),

    :   MtpPacket(16384),   // MAX_USBFS_BUFFER_SIZE

        mOffset(MTP_CONTAINER_HEADER_SIZE)

{

}
@@ -399,10 +399,10 @@ int MtpDataPacket::read(struct usb_request *request) { 
    if (length >= MTP_CONTAINER_HEADER_SIZE) {

        // look at the length field to see if the data spans multiple packets

        uint32_t totalLength = MtpPacket::getUInt32(MTP_CONTAINER_LENGTH_OFFSET);

        allocate(totalLength);

        while (totalLength > length) {

            allocate(length + mAllocationIncrement);

            request->buffer = mBuffer + length;

            request->buffer_length = mAllocationIncrement;

            request->buffer_length = totalLength - length;

            int ret = transfer(request);

            if (ret >= 0)

                length += ret;