diff options
| author | John Reck <jreck@google.com> | 2012-08-30 14:53:42 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-30 14:53:42 -0700 |
| commit | 30b5bea07b7357b5063a12e54f002adae9af2b39 (patch) | |
| tree | 1f55517f624afccd6f6768aa445074c0d20aae52 /core/java/android | |
| parent | 3dda2cffafd94f7f9885efae1c9dc06bc3a625f0 (diff) | |
| parent | 6fdd49630834b1c20a781c9d29b241a68d1289ef (diff) | |
| download | frameworks_base-30b5bea07b7357b5063a12e54f002adae9af2b39.zip frameworks_base-30b5bea07b7357b5063a12e54f002adae9af2b39.tar.gz frameworks_base-30b5bea07b7357b5063a12e54f002adae9af2b39.tar.bz2 | |
am 6fdd4963: Merge "DO NOT MERGE Remove dead code" into jb-dev
* commit '6fdd49630834b1c20a781c9d29b241a68d1289ef':
DO NOT MERGE Remove dead code
Diffstat (limited to 'core/java/android')
| -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 34c08ef..d38c20b 100644 --- a/core/java/android/webkit/WebViewClassic.java +++ b/core/java/android/webkit/WebViewClassic.java @@ -1368,7 +1368,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); |