Merge "Intercept abnormal MotionEvent in GestureDetector#onTouchEvent"

2022-08-31 18:25:48 +00:00
parent 56fe9580ff 9f45a12cc1
commit 009ccfbabb
1 changed files with 4 additions and 1 deletions
--- a/core/java/android/view/GestureDetector.java
+++ b/core/java/android/view/GestureDetector.java
@@ -653,7 +653,7 @@ public class GestureDetector {
                break;

            case MotionEvent.ACTION_MOVE:
-                if (mInLongPress || mInContextClick) {
+                if ((mCurrentDownEvent == null) || mInLongPress || mInContextClick) {
                    break;
                }

@@ -736,6 +736,9 @@ public class GestureDetector {
                break;

            case MotionEvent.ACTION_UP:
+                if (mCurrentDownEvent == null) {
+                    break;
+                }
                mStillDown = false;
                MotionEvent currentUpEvent = MotionEvent.obtain(ev);
                if (mIsDoubleTapping) {