Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fa4baa34 authored by Yunlian Jiang's avatar Yunlian Jiang Committed by android-build-merger
Browse files

Merge "fix warning: struct argument contains uninitialized data" 

am: 4ad8990c

Change-Id: If332f7d2f5be4180f4cf32f92ae86d62711f3b9b
parents ad17ddb3 4ad8990c

media/mtp/MtpServer.cpp

+5 −0
Original line number Original line Diff line number Diff line
@@ -1060,6 +1060,9 @@ MtpResponseCode MtpServer::doSendObject() { 
                mfr.length = mSendObjectFileSize - initialData;

                mfr.length = mSendObjectFileSize - initialData;

            }

            }





            mfr.command = 0;

            mfr.transaction_id = 0;



            // transfer the file

            // transfer the file

            ret = sHandle->receiveFile(mfr);

            ret = sHandle->receiveFile(mfr);

            if ((ret < 0) && (errno == ECANCELED)) {

            if ((ret < 0) && (errno == ECANCELED)) {
@@ -1257,6 +1260,8 @@ MtpResponseCode MtpServer::doSendPartialObject() { 
            mfr.fd = edit->mFD;

            mfr.fd = edit->mFD;

            mfr.offset = offset;

            mfr.offset = offset;

            mfr.length = length;

            mfr.length = length;

            mfr.command = 0;

            mfr.transaction_id = 0;





            // transfer the file

            // transfer the file

            ret = sHandle->receiveFile(mfr);

            ret = sHandle->receiveFile(mfr);