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

Commit 4e67e3e0 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "MTP: enable new cancel behavior in short packet handling" into sc-dev am: f8f01ad3 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/15075193

Change-Id: Id1464f8ea0a25322bd6b53a93e30c44d1f637ae0
parents 39a21d0d f8f01ad3

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;

                }

            }