summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Ats Jenk <atsjenk@google.com> 2022-11-15 13:41:07 -0800
committer Ats Jenk <atsjenk@google.com> 2022-11-15 14:06:26 -0800
commit0ea217bce0d9980a51337613fb4011dea71786d1 (patch)
tree9e56f635afc54e6bd026c5256319567cab52aaa5
parent1a43d1b5b1cd4157fe1dd558598d0a49205fd839 (diff)
Fix crash when handling touch on caption
http://ag/20355140 moved drag detection outside the switch block. It now can be true when we are not going to handle the touch. Add extra check for mShouldHandleEvents before processing ACTION_UP or ACTION_CANCEL. Bug: 259297955 Test: touch down outside the window, in caption area, drag finger and release Test: attach a bluetooth mouse and resize the window from sides Change-Id: I6645479eb1709e68ade87d2d7e7babdf99f232aa
-rw-r--r--libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DragResizeInputListener.java2
1 files changed, 1 insertions, 1 deletions
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 48c0cea150cc..d3f1332f6224 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 @@ 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));