commit d41f29df8489719a93d09d420d2ef706b2233234
author Ats Jenk <atsjenk@google.com> Wed Nov 16 19:06:53 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Nov 16 19:06:53 2022 +0000
tree e01c8ac5f677b13998df8153d7c65f0339b10cc0
parent ee98ff1a41b00e3e5897aee5e71012ebbf0e75e2
parent 0ea217bce0d9980a51337613fb4011dea71786d1

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

libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DragResizeInputListener.java

diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DragResizeInputListener.java b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DragResizeInputListener.java
index 48c0cea1..d3f1332 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DragResizeInputListener.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DragResizeInputListener.java
@@ -317,7 +317,7 @@
                 }
                 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));