From f90165aeda1a8353c1b5e837b1ef4a818ecbefc5 Mon Sep 17 00:00:00 2001
From: Adam Powell <adamp@google.com>
Date: Fri, 31 Aug 2012 11:11:39 -0700
Subject: [PATCH] GestureDetector - Mask action when checking POINTER_UP

Bug 7088494

Change-Id: I723e9b77f0d0473f9d769e53aaa568c4aaac90aa
---
 core/java/android/view/GestureDetector.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/java/android/view/GestureDetector.java b/core/java/android/view/GestureDetector.java
index 23337f03792c2..4bbdd4e3b534a 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