commit fa4baa3422c095e7c640c5725b5f6bba8b467cca
author Yunlian Jiang <yunlian@google.com> Wed Feb 22 02:12:54 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Feb 22 02:12:54 2017 +0000
tree 1fb2d4d8f5c018ae57ce1339bae7db0931645c51
parent ad17ddb376a88792635bb7155a735c56060870f3
parent 4ad8990c1466fe3a43c9726e96416032be28c709

Merge "fix  warning: struct argument contains uninitialized data"
am: 4ad8990c14

Change-Id: If332f7d2f5be4180f4cf32f92ae86d62711f3b9b

media/mtp/MtpServer.cpp

diff --git a/media/mtp/MtpServer.cpp b/media/mtp/MtpServer.cpp
index 753d833..5a1d6dc 100644
--- a/media/mtp/MtpServer.cpp
+++ b/media/mtp/MtpServer.cpp
@@ -1060,6 +1060,9 @@
                 mfr.length = mSendObjectFileSize - initialData;
             }
 
+            mfr.command = 0;
+            mfr.transaction_id = 0;
+
             // transfer the file
             ret = sHandle->receiveFile(mfr);
             if ((ret < 0) && (errno == ECANCELED)) {
@@ -1257,6 +1260,8 @@
             mfr.fd = edit->mFD;
             mfr.offset = offset;
             mfr.length = length;
+            mfr.command = 0;
+            mfr.transaction_id = 0;
 
             // transfer the file
             ret = sHandle->receiveFile(mfr);