summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Mike Lockwood <lockwood@android.com> 2010-11-10 12:49:36 -0500
committer Mike Lockwood <lockwood@android.com> 2010-11-10 12:49:36 -0500
commit83cff86dcd5b137fd21f765f35736cf313a89ae1 (patch)
treec336e194c0385f76435b8df00d0c431bef4c3bd3
parent4a65e281fa0390a0c58d0e37eea9c756a7bbb3fd (diff)
MTP: Don't dump data packets twice in debug output.
Change-Id: I49b383d39aea101a58ae6902952ba91b44e7dc3b Signed-off-by: Mike Lockwood <lockwood@android.com>
-rw-r--r--media/mtp/MtpDataPacket.cpp1
-rw-r--r--media/mtp/MtpDebug.cpp1
2 files changed, 0 insertions, 2 deletions
diff --git a/media/mtp/MtpDataPacket.cpp b/media/mtp/MtpDataPacket.cpp
index ec78ff02d1f7..20dd94d0e922 100644
--- a/media/mtp/MtpDataPacket.cpp
+++ b/media/mtp/MtpDataPacket.cpp
@@ -373,7 +373,6 @@ int MtpDataPacket::readDataHeader(int fd) {
int MtpDataPacket::write(int fd) {
MtpPacket::putUInt32(MTP_CONTAINER_LENGTH_OFFSET, mPacketSize);
MtpPacket::putUInt16(MTP_CONTAINER_TYPE_OFFSET, MTP_CONTAINER_TYPE_DATA);
- dump();
// send header separately from data
int ret = ::write(fd, mBuffer, MTP_CONTAINER_HEADER_SIZE);
if (ret == MTP_CONTAINER_HEADER_SIZE)
diff --git a/media/mtp/MtpDebug.cpp b/media/mtp/MtpDebug.cpp
index d6b107d7434c..34168072b958 100644
--- a/media/mtp/MtpDebug.cpp
+++ b/media/mtp/MtpDebug.cpp
@@ -63,7 +63,6 @@ static const CodeEntry sOperationCodes[] = {
};
static const CodeEntry sFormatCodes[] = {
- { "MTP_OPERATION_GET_DEVICE_INFO", 0x1001 },
{ "MTP_FORMAT_UNDEFINED", 0x3000 },
{ "MTP_FORMAT_ASSOCIATION", 0x3001 },
{ "MTP_FORMAT_SCRIPT", 0x3002 },