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

Commit a33b7d94 authored by Mike Lockwood's avatar Mike Lockwood Committed by Android Git Automerger
Browse files

am 7f87d9cf: Merge "MTP: Don\'t attempt to read more than 16K at a time from... 

am 7f87d9cf: Merge "MTP: Don\'t attempt to read more than 16K at a time from the MTP driver DO NOT MERGE" into ics-mr1

* commit '7f87d9cf666c38b9f43b7b2d99acbd9c8f91d8d1':
  MTP: Don't attempt to read more than 16K at a time from the MTP driver DO NOT MERGE
parents d7217d71 8af4c7d0

media/mtp/MtpDataPacket.cpp

+4 −2
Original line number Diff line number Diff line
@@ -25,10 +25,12 @@ 
#include "MtpDataPacket.h"

#include "MtpStringBuffer.h"



#define MTP_BUFFER_SIZE 16384



namespace android {



MtpDataPacket::MtpDataPacket()

    :   MtpPacket(16384),   // MAX_USBFS_BUFFER_SIZE

    :   MtpPacket(MTP_BUFFER_SIZE),   // MAX_USBFS_BUFFER_SIZE

        mOffset(MTP_CONTAINER_HEADER_SIZE)

{

}
@@ -345,7 +347,7 @@ void MtpDataPacket::putString(const uint16_t* string) { 


#ifdef MTP_DEVICE 

int MtpDataPacket::read(int fd) {

    int ret = ::read(fd, mBuffer, mBufferSize);

    int ret = ::read(fd, mBuffer, MTP_BUFFER_SIZE);

    if (ret < MTP_CONTAINER_HEADER_SIZE)

        return -1;

    mPacketSize = ret;