Skip to content

Commit 7a83b93

Browse files
author
Dianne Hackborn
committed
Fix issue #6447773: Pulse does not run in JB (NPE in GestureDetector.onTouchEvent)
Change-Id: I20b6d58fa47851cf401bbeb16960d118bbd1d965
1 parent d7e4ae4 commit 7a83b93

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

core/java/android/view/GestureDetector.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -585,8 +585,12 @@ public boolean onTouchEvent(MotionEvent ev) {
585585
}
586586
// Hold the event we obtained above - listeners may have changed the original.
587587
mPreviousUpEvent = currentUpEvent;
588-
mVelocityTracker.recycle();
589-
mVelocityTracker = null;
588+
if (mVelocityTracker != null) {
589+
// This may have been cleared when we called out to the
590+
// application above.
591+
mVelocityTracker.recycle();
592+
mVelocityTracker = null;
593+
}
590594
mIsDoubleTapping = false;
591595
mHandler.removeMessages(SHOW_PRESS);
592596
mHandler.removeMessages(LONG_PRESS);

0 commit comments

Comments
 (0)