diff options
| author | Dianne Hackborn <hackbod@google.com> | 2012-05-21 15:27:39 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-05-21 15:27:39 -0700 |
| commit | 7ad04d3ff4c1d9d2a26387c4247d8fc75551ea77 (patch) | |
| tree | 1b16421ac2fd2c442984c2a6c3cd2515a9673e5c | |
| parent | 8d302f6d27b95317c7508bc19eb7f35aa83cfd5c (diff) | |
| parent | af5c01185bb9f76fd6cbdc87344f1d9b60ebdd8c (diff) | |
| download | frameworks_base-7ad04d3ff4c1d9d2a26387c4247d8fc75551ea77.zip frameworks_base-7ad04d3ff4c1d9d2a26387c4247d8fc75551ea77.tar.gz frameworks_base-7ad04d3ff4c1d9d2a26387c4247d8fc75551ea77.tar.bz2 | |
am af5c0118: Merge "Fix issue #6447773: Pulse does not run in JB (NPE in GestureDetector.onTouchEvent)" into jb-dev
* commit 'af5c01185bb9f76fd6cbdc87344f1d9b60ebdd8c':
Fix issue #6447773: Pulse does not run in JB (NPE in GestureDetector.onTouchEvent)
| -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 25d08ac..0114a41 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); |