commit 1affa6440d6d8c6ce3ab33acd38f675fe783c7a9
author Yunlian Jiang <yunlian@google.com> Wed Feb 22 02:15:22 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Feb 22 02:15:22 2017 +0000
tree 1fb2d4d8f5c018ae57ce1339bae7db0931645c51
parent bae27c1095eb5e3503c9bdc7e2c6d5b8ab98dba2
parent fa4baa3422c095e7c640c5725b5f6bba8b467cca

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

Change-Id: Ia7a0d46b0a4cb0c1d39b6c9ec9f0e06c733b009b

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