Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Michael Kolb
2012-04-26 10:54:58 -07:00
committed by Android (Google) Code Review
parent 8037cad6c1 13d7c03eb8
commit 77974166db
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/webkit/WebViewClassic.java
View File

@@ -2598,7 +2598,8 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc
*/ */
@Override @Override
public boolean isPrivateBrowsingEnabled() { public boolean isPrivateBrowsingEnabled() {
return getSettings().isPrivateBrowsingEnabled(); WebSettingsClassic settings = getSettings();
return (settings != null) ? settings.isPrivateBrowsingEnabled() : false;
} }
private void startPrivateBrowsing() { private void startPrivateBrowsing() {