commit 4fd9a8b9865addfedbcd84d5c9efea0f647086a0
author Daichi Hirono <hirono@google.com> Thu Aug 20 15:13:40 2015 +0900
committer Daichi Hirono <hirono@google.com> Mon Aug 24 17:53:28 2015 +0900
tree fcab096d691d3463873eba0c7c7a561416cee36b
parent 6d5a0de5177bccc17d0eb1b69a8ed88d620884a5

Use common implementation for getObject and importFile.

Previously the two functions have separate but similar implementation. ag/750097
fixed a bug in importFile, but we have a same bug in getObject. Instead fixing
the bug separately, the CL adds a common function that can be used from both
getObject and importFile.

BUG=23264575

Change-Id: I0bdc876ee9b11301ba4c445cc16556e9c951a8b4

media/mtp/MtpDataPacket.h

diff --git a/media/mtp/MtpDataPacket.h b/media/mtp/MtpDataPacket.h
index 13d3bd9..6240f28 100644
--- a/media/mtp/MtpDataPacket.h
+++ b/media/mtp/MtpDataPacket.h
@@ -117,7 +117,7 @@
 
     inline bool         hasData() const { return mPacketSize > MTP_CONTAINER_HEADER_SIZE; }
     inline uint32_t     getContainerLength() const { return MtpPacket::getUInt32(MTP_CONTAINER_LENGTH_OFFSET); }
-    void*               getData(int& outLength) const;
+    void*               getData(int* outLength) const;
 };
 
 }; // namespace android