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

Commit 3f658d2c authored by Ray Chi's avatar Ray Chi
Browse files

MTP: enable new cancel behavior in short packet handling 

Since short packet handling still use older cancel bahavior,
the cancel may be failed if users copy specific files to the
PC.

This patch will send batchcancel flag to cancelEvents in
short packet handling so that cancelEvents function will
select the cancel behavior by batchcancel flag.

Bug: 181729410
Test: verified with specific files
Change-Id: Ie018453fd4a5d6ea9353771a5de2711ba18b171e
parent 28155d13

media/mtp/MtpFfsHandle.cpp

+2 −1
Original line number Diff line number Diff line
@@ -518,7 +518,8 @@ int MtpFfsHandle::receiveFile(mtp_file_range mfr, bool zero_packet) { 
                }

            }

            if (short_packet) {

                if (cancelEvents(mIobuf[i].iocb.data(), ioevs, short_i, mIobuf[i].actual, false)) {

                if (cancelEvents(mIobuf[i].iocb.data(), ioevs, short_i, mIobuf[i].actual,

                        mBatchCancel)) {

                    write_error = true;

                }

            }