Merge "Fix NPE"

1 files changed, 4 insertions, 0 deletions

diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index 86185103c5d5..570b4a82e639 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -5345,7 +5345,11 @@ public class WebView extends AbsoluteLayout
         }
     }
 
+    // TODO: Remove this
     WebViewCore.CursorData cursorData() {
+        if (sDisableNavcache) {
+            return new WebViewCore.CursorData(0, 0, 0, 0);
+        }
         WebViewCore.CursorData result = cursorDataNoPosition();
         Point position = nativeCursorPosition();
         result.mX = position.x;