| commit | 06838319b78f14559980bfaa69e5a13e9fc1ff00 | [log] [tgz] |
|---|---|---|
| author | Ats Jenk <atsjenk@google.com> | Wed Nov 16 20:08:53 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Nov 16 20:08:53 2022 +0000 |
| tree | d72949109238d5f50c0130e91702036b9cef8326 | |
| parent | a7359473729beb38287deb15c92394030f032fea [diff] | |
| parent | 5c915f0af18b0ab0e22acc5a31ac1f71be6f6564 [diff] |
Merge "Fix crash when handling touch on caption" into tm-qpr-dev am: d41f29df84 am: 5c915f0af1 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20485462 Change-Id: I7065bf46d77801397476a7e37d6a5206eb0489f7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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));