commit 79a9526b3314fd133355ce7ba68e8465c98137c7
author Yunlian Jiang <yunlian@google.com> Wed Feb 22 02:16:54 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Feb 22 02:16:54 2017 +0000
tree 8bc042cafdde8caf221974017d47112559399116
parent 9f84bbbce06b8aa6f59d760d85897c0d0c4d101e
parent 1affa6440d6d8c6ce3ab33acd38f675fe783c7a9

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

Change-Id: Iaa8594d8fdce768104e77d2df8aa5a0728bb767a

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