summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Huahui Wu <hwu@google.com> 2011-01-20 11:08:33 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 2011-01-20 11:08:33 -0800
commit292f39c1201f2f08ac90d5562a7fd7070e9b32a0 (patch)
tree0756bd393e4789760e025d40da3431aafcb1a283
parent1ec1fdfce959069f3092c15d27efc1c2286dc15c (diff)
parentbc7c148285ee39f2eafbfbe98d8fbbbe4bcc53bd (diff)
Merge "b/3350774 Enforce clearing the flag mIsHandlingMultiTouch." into honeycomb
-rw-r--r--core/java/android/webkit/WebView.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index 82e6964a5cb9..f5ad6feb0fac 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -5405,6 +5405,7 @@ public class WebView extends AbsoluteLayout
case MotionEvent.ACTION_DOWN: {
mPreventDefault = PREVENT_DEFAULT_NO;
mConfirmMove = false;
+ mIsHandlingMultiTouch = false;
mInitialHitTestResult = null;
if (!mScroller.isFinished()) {
// stop the current scroll animation, but if this is