From b77bcd1bb45a801de1d6e362cfe4775dd0b10080 Mon Sep 17 00:00:00 2001 From: Patrick Scott Date: Thu, 22 Jul 2010 14:00:19 -0400 Subject: Fix gmail crash. Change-Id: I009d44fce36e365e915b2ecbdfd94fdcee40adf8 --- core/java/android/webkit/WebView.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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. -- cgit v1.2.3-59-g8ed1b