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

Commit effa7523 authored by John Reck's avatar John Reck Committed by Android (Google) Code Review
Browse files

Merge "NPE guard in setupViewport"

parents d5cabff9 d4324aa1

core/java/android/webkit/WebViewCore.java

+4 −0
Original line number Diff line number Diff line
@@ -2240,6 +2240,10 @@ public final class WebViewCore { 
    }



    private void setupViewport(boolean updateViewState) {

        if (mWebView == null || mSettings == null) {

            // We've been destroyed or are being destroyed, return early

            return;

        }

        // set the viewport settings from WebKit

        setViewportSettingsFromNative();