Merge "Fix NullPointerException in GestureDetector"

2023-05-25 14:21:30 +00:00
parent 47818c0a2d c5171f785c
commit 534f3a94aa
1 changed files with 4 additions and 2 deletions
--- a/core/java/android/view/GestureDetector.java
+++ b/core/java/android/view/GestureDetector.java
@@ -839,8 +839,10 @@ public class GestureDetector {
        mHandler.removeMessages(SHOW_PRESS);
        mHandler.removeMessages(LONG_PRESS);
        mHandler.removeMessages(TAP);
-        mVelocityTracker.recycle();
-        mVelocityTracker = null;
+        if (mVelocityTracker != null) {
+            mVelocityTracker.recycle();
+            mVelocityTracker = null;
+        }
        mIsDoubleTapping = false;
        mStillDown = false;
        mAlwaysInTapRegion = false;