From 3eefc126e5a0b4af4738332e8d43fe2e2d00424c Mon Sep 17 00:00:00 2001
From: Cary Clark <cary@android.com>
Date: Mon, 5 Apr 2010 15:05:59 -0400
Subject: [PATCH] check for webviewcore before reading settings

In setActive(), the WebViewCore instance may
have already been destroyed before the settings
object can be read.

Change-Id: I46b2a57b2d92fc7216b1c984f7044fea1fc2409e
http://b/2570700
---
 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 0b79ac4752700..5cfbe737454b4 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -3974,7 +3974,7 @@ public class WebView extends AbsoluteLayout
                 // false for the first parameter
             }
         } else {
-            if (getSettings().getBuiltInZoomControls()
+            if (mWebViewCore != null && getSettings().getBuiltInZoomControls()
                     && !getZoomButtonsController().isVisible()) {
                 /*
                  * The zoom controls come in their own window, so our window