commit 8ae4dc4d26406f362252f241bdc58998d8cab453
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Jun 23 10:10:24 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jun 23 10:10:24 2021 +0000
tree 7102dfeaa7753d3c4b1a40673a61b44d31db51f2
parent 6a0e126ae01c0cafd9c4673d9fca48a80ff6ee93
parent ea0d6a69ed46d6703c51acc7f40196f52d9a8585

Merge "MTP: enable new cancel behavior in short packet handling" into sc-dev am: f8f01ad3e5 am: 624b46a9a9 am: ea0d6a69ed

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

Change-Id: Ia2c4664f903d32a60c7abcee249a710758ebaaaa

media/mtp/MtpFfsHandle.cpp

diff --git a/media/mtp/MtpFfsHandle.cpp b/media/mtp/MtpFfsHandle.cpp
index 4d50d66..2ffd775 100644
--- a/media/mtp/MtpFfsHandle.cpp
+++ b/media/mtp/MtpFfsHandle.cpp
@@ -518,7 +518,8 @@
                 }
             }
             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;
                 }
             }