Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 38c846c1 authored by Michael Kolb's avatar Michael Kolb Committed by Android Git Automerger
Browse files

am d5515509: am 77974166: Merge "Fix NPE in isPrivateBrowsingEnabled()" into jb-dev 

* commit 'd5515509':
  Fix NPE in isPrivateBrowsingEnabled()
parents b00d41b9 d5515509

core/java/android/webkit/WebViewClassic.java

+2 −1
Original line number Diff line number Diff line
@@ -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() {