summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Patrick Scott <phanna@android.com> 2010-07-22 14:00:19 -0400
committer Patrick Scott <phanna@android.com> 2010-07-22 14:01:55 -0400
commitb77bcd1bb45a801de1d6e362cfe4775dd0b10080 (patch)
treeebf12fbbb3eaeeec451020dd9ef8efe0ddf6d079
parent65f71a72702084cefec33993b019395da6cc4ff9 (diff)
Fix gmail crash.
Change-Id: I009d44fce36e365e915b2ecbdfd94fdcee40adf8
-rw-r--r--core/java/android/webkit/WebView.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index fd0780fabe08..03382c3b0496 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -4590,7 +4590,7 @@ public class WebView extends AbsoluteLayout
// user has touched a layer.
float gestureX = x;
float gestureY = y;
- if (!detector.isInProgress()) {
+ if (detector == null || !detector.isInProgress()) {
// The gesture for scrolling a layer is two fingers close together.
// FIXME: we may consider giving WebKit an option to handle
// multi-touch events later.