diff options
| author | Dianne Hackborn <hackbod@google.com> | 2012-05-21 15:25:48 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-21 15:25:48 -0700 |
| commit | af5c01185bb9f76fd6cbdc87344f1d9b60ebdd8c (patch) | |
| tree | 05d927e3783dd8190320e435f61ffe37d4562022 /core/java | |
| parent | de83e7aa32e7b1a6c8aea780664150345b7ae097 (diff) | |
| parent | 7a83b93e12e4a215b90bfa32a753a5a53525d011 (diff) | |
Merge "Fix issue #6447773: Pulse does not run in JB (NPE in GestureDetector.onTouchEvent)" into jb-dev
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/view/GestureDetector.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/core/java/android/view/GestureDetector.java b/core/java/android/view/GestureDetector.java index 25d08acb2965..0114a419f23c 100644 --- a/core/java/android/view/GestureDetector.java +++ b/core/java/android/view/GestureDetector.java @@ -585,8 +585,12 @@ public class GestureDetector { } // Hold the event we obtained above - listeners may have changed the original. mPreviousUpEvent = currentUpEvent; - mVelocityTracker.recycle(); - mVelocityTracker = null; + if (mVelocityTracker != null) { + // This may have been cleared when we called out to the + // application above. + mVelocityTracker.recycle(); + mVelocityTracker = null; + } mIsDoubleTapping = false; mHandler.removeMessages(SHOW_PRESS); mHandler.removeMessages(LONG_PRESS); |