Merge "Fix crash when handling touch on caption" into tm-qpr-dev am: d41f29df84

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

Change-Id: Iac52577432362349c35f90798a1d56b867ad4109
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Ats Jenk
2022-11-16 19:29:58 +00:00
committed by Automerger Merge Worker

View File

@@ -317,7 +317,7 @@ class DragResizeInputListener implements AutoCloseable {
}
case MotionEvent.ACTION_UP:
case MotionEvent.ACTION_CANCEL: {
if (mDragging) {
if (mShouldHandleEvents && mDragging) {
int dragPointerIndex = e.findPointerIndex(mDragPointerId);
mCallback.onDragResizeEnd(
e.getRawX(dragPointerIndex), e.getRawY(dragPointerIndex));