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

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

Browse Source
This commit is contained in:
Mike Lockwood
2011-12-02 13:20:39 -08:00
committed by Android (Google) Code Review
parent 25bcbbb597 7a1ad63d16
commit 7f87d9cf66
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
media/mtp/MtpDataPacket.cpp
View File

@@ -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;