Merge "Fix NPE in isPrivateBrowsingEnabled()" into jb-dev

Michael Kolb · Android (Google) Code Review · commit 77974166dbb9 · 2012-04-26T10:54:58.000-07:00
diff --git a/core/java/android/webkit/WebViewClassic.java b/core/java/android/webkit/WebViewClassic.java
@@ -2598,7 +2598,8 @@ private void goBackOrForward(int steps, boolean ignoreSnapshot) {
      */
     @Override
     public boolean isPrivateBrowsingEnabled() {
-        return getSettings().isPrivateBrowsingEnabled();
+        WebSettingsClassic settings = getSettings();
+        return (settings != null) ? settings.isPrivateBrowsingEnabled() : false;
     }
 
     private void startPrivateBrowsing() {

Original file line number	Diff line number	Diff line change
`@@ -2598,7 +2598,8 @@ private void goBackOrForward(int steps, boolean ignoreSnapshot) {`
`2598`	`2598`	`*/`
`2599`	`2599`	`@Override`
`2600`	`2600`	`public boolean isPrivateBrowsingEnabled() {`
`2601`		`- return getSettings().isPrivateBrowsingEnabled();`
	`2601`	`+ WebSettingsClassic settings = getSettings();`
	`2602`	`+ return (settings != null) ? settings.isPrivateBrowsingEnabled() : false;`
`2602`	`2603`	`}`
`2603`	`2604`
`2604`	`2605`	`private void startPrivateBrowsing() {`