Merge "Fix NullPointerException in GestureDetector" am: 534f3a94aa am: ab048ad534 am: 09c03b7eb6

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2600371

Change-Id: I61a3d30bd76215f5f22ec3b7721481eb70515b13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Alan Viverette
2023-05-25 16:28:12 +00:00
committed by Automerger Merge Worker

View File

@@ -841,8 +841,10 @@ public class GestureDetector {
mHandler.removeMessages(SHOW_PRESS); mHandler.removeMessages(SHOW_PRESS);
mHandler.removeMessages(LONG_PRESS); mHandler.removeMessages(LONG_PRESS);
mHandler.removeMessages(TAP); mHandler.removeMessages(TAP);
mVelocityTracker.recycle(); if (mVelocityTracker != null) {
mVelocityTracker = null; mVelocityTracker.recycle();
mVelocityTracker = null;
}
mIsDoubleTapping = false; mIsDoubleTapping = false;
mStillDown = false; mStillDown = false;
mAlwaysInTapRegion = false; mAlwaysInTapRegion = false;