DO NOT MERGE GestureDetector - Mask action when checking POINTER_UP

Bug 7088494 Change-Id: I723e9b77f0d0473f9d769e53aaa568c4aaac90aa
2012-08-31 11:11:39 -07:00
parent ecb388efef
commit 39263601cc
1 changed files with 2 additions and 1 deletions
--- 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