summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2012-08-28 16:22:11 -0700
committerThe Android Automerger <android-build@android.com>2012-08-30 16:04:25 -0700
commit21ee2ca458b11ee948794109022257777d4f16de (patch)
tree5dcdd9449b30a0c86362ee9655a7002ce28b6da1
parent8be03ace9500e03e6aa482713cdd07caf5ca6421 (diff)
downloadbase-21ee2ca458b11ee948794109022257777d4f16de.tar.gz
DO NOT MERGE Remove dead code
Cherry pick Change-Id: I19603a6e234b0b2592ef90fd426b2973cff8e4fd
-rw-r--r--core/java/android/webkit/WebViewClassic.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/webkit/WebViewClassic.java b/core/java/android/webkit/WebViewClassic.java
index 84a6129e8c4d..d8541fadc2d1 100644
--- a/core/java/android/webkit/WebViewClassic.java
+++ b/core/java/android/webkit/WebViewClassic.java
@@ -1364,7 +1364,7 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc
if (action == MotionEvent.ACTION_POINTER_DOWN) {
cancelTouch();
action = MotionEvent.ACTION_DOWN;
- } else if (action == MotionEvent.ACTION_POINTER_UP && ev.getPointerCount() >= 2) {
+ } else if (action == MotionEvent.ACTION_POINTER_UP) {
// set mLastTouchX/Y to the remaining points for multi-touch.
mLastTouchX = Math.round(x);
mLastTouchY = Math.round(y);