From 79d99bebc19cf20cb486953ef2e9f6d96b27ab18 Mon Sep 17 00:00:00 2001
From: John Reck <jreck@google.com>
Date: Tue, 28 Feb 2012 11:21:17 -0800
Subject: Fix NPE

 Bug: 6083360

Change-Id: I8d4a4cfb4ca0bbefd848a6ed7a628bc3838e4f91
---
 core/java/android/webkit/WebView.java | 4 ++++
 1 file changed, 4 insertions(+)

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;
-- 
cgit v1.2.3-59-g8ed1b