summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2012-05-11 13:50:57 -0700
committerJohn Reck <jreck@google.com>2012-05-11 13:50:57 -0700
commit387c2e8d425651475c674018951a4047bf4f3cb4 (patch)
treeee93e85f20962551f54a41ad442113ecbe8c37c7 /core/java
parentb23341e4c55667de6408f64206cb44c174d36121 (diff)
downloadframeworks_base-387c2e8d425651475c674018951a4047bf4f3cb4.zip
frameworks_base-387c2e8d425651475c674018951a4047bf4f3cb4.tar.gz
frameworks_base-387c2e8d425651475c674018951a4047bf4f3cb4.tar.bz2
Prevent updateStateTrackers from being affected by preventDefault()
Bug: 6477996 Calling e.preventDefault() on a javascript touch handler is apparantly not supposed to prevent the default gesture detector, who knew? Change-Id: I6ee36e2fbc485b289b6dbb3464d8562c88e3be49
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/webkit/WebViewInputDispatcher.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/webkit/WebViewInputDispatcher.java b/core/java/android/webkit/WebViewInputDispatcher.java
index 9541435..9328d8c 100644
--- a/core/java/android/webkit/WebViewInputDispatcher.java
+++ b/core/java/android/webkit/WebViewInputDispatcher.java
@@ -334,6 +334,7 @@ final class WebViewInputDispatcher {
DispatchEvent d = obtainDispatchEventLocked(eventToEnqueue, eventType, 0,
webKitXOffset, webKitYOffset, webKitScale);
+ updateStateTrackersLocked(d, event);
enqueueEventLocked(d);
}
return true;
@@ -787,7 +788,6 @@ final class WebViewInputDispatcher {
flags = d.mFlags;
- updateStateTrackersLocked(d, event);
if (event == d.mEvent) {
d.mEvent = null; // retain ownership of event, don't recycle it yet
}