diff options
| author | Adam Powell <adamp@google.com> | 2012-08-31 11:11:39 -0700 |
|---|---|---|
| committer | The Android Automerger <android-build@android.com> | 2012-08-31 13:56:46 -0700 |
| commit | c104d168789450d655f7efbab209dbf4d125bac4 (patch) | |
| tree | b2f69f12471e9b3f0fc1ef4c82371e001fb127d4 | |
| parent | 21ee2ca458b11ee948794109022257777d4f16de (diff) | |
| download | base-c104d168789450d655f7efbab209dbf4d125bac4.tar.gz | |
DO NOT MERGE GestureDetector - Mask action when checking POINTER_UP
Bug 7088494
Change-Id: I723e9b77f0d0473f9d769e53aaa568c4aaac90aa
| -rw-r--r-- | core/java/android/view/GestureDetector.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/view/GestureDetector.java b/core/java/android/view/GestureDetector.java index 23337f03792c..4bbdd4e3b534 100644 --- a/core/java/android/view/GestureDetector.java +++ b/core/java/android/view/GestureDetector.java @@ -453,7 +453,8 @@ public class GestureDetector { } mVelocityTracker.addMovement(ev); - final boolean pointerUp = action == MotionEvent.ACTION_POINTER_UP; + final boolean pointerUp = + (action & MotionEvent.ACTION_MASK) == MotionEvent.ACTION_POINTER_UP; final int skipIndex = pointerUp ? ev.getActionIndex() : -1; // Determine focal point |