diff options
| author | John Reck <jreck@google.com> | 2012-08-30 14:50:16 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-08-30 14:50:17 -0700 |
| commit | 6fdd49630834b1c20a781c9d29b241a68d1289ef (patch) | |
| tree | 9d4df4c0682dce9648957d945f8a261fefe62518 /core | |
| parent | ecb388efefc427c3fa93f07fd11502564dc194a5 (diff) | |
| parent | 2ec10989613984ccd7616af1989b2e3ae1c442b8 (diff) | |
| download | frameworks_base-6fdd49630834b1c20a781c9d29b241a68d1289ef.zip frameworks_base-6fdd49630834b1c20a781c9d29b241a68d1289ef.tar.gz frameworks_base-6fdd49630834b1c20a781c9d29b241a68d1289ef.tar.bz2 | |
Merge "DO NOT MERGE Remove dead code" into jb-dev
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/webkit/WebViewClassic.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/webkit/WebViewClassic.java b/core/java/android/webkit/WebViewClassic.java index 84a6129..d8541fa 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); |