From 13d7c03eb8e8272d0f1741d8505c769daefa4438 Mon Sep 17 00:00:00 2001
From: Michael Kolb <kolby@google.com>
Date: Thu, 26 Apr 2012 10:43:08 -0700
Subject: [PATCH] Fix NPE in isPrivateBrowsingEnabled()

  Bug: 6393286

Change-Id: I1fd9c57b7bd68a9c495cbb0df45a406f83b22b5f
---
 core/java/android/webkit/WebViewClassic.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/java/android/webkit/WebViewClassic.java b/core/java/android/webkit/WebViewClassic.java
index 05b3e643cca41..4d6094dc58cc9 100644
--- a/core/java/android/webkit/WebViewClassic.java
+++ b/core/java/android/webkit/WebViewClassic.java
@@ -2598,7 +2598,8 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc
      */
     @Override
     public boolean isPrivateBrowsingEnabled() {
-        return getSettings().isPrivateBrowsingEnabled();
+        WebSettingsClassic settings = getSettings();
+        return (settings != null) ? settings.isPrivateBrowsingEnabled() : false;
     }
 
     private void startPrivateBrowsing() {