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

2022-11-16 19:06:53 +00:00
parent ee98ff1a41 0ea217bce0
commit d41f29df84
1 changed files with 1 additions and 1 deletions
--- 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 @@ 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));