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

Commit 1cab1936 authored by Cary Clark's avatar Cary Clark Committed by Android Git Automerger
Browse files

am 6cf2c14f: am 3eefc126: check for webviewcore before reading settings 

Merge commit '6cf2c14f' into kraken

* commit '6cf2c14f':
  check for webviewcore before reading settings
parents edff6dbe 6cf2c14f

core/java/android/webkit/WebView.java

+1 −1
Original line number Diff line number Diff line
@@ -3974,7 +3974,7 @@ public class WebView extends AbsoluteLayout 
                // false for the first parameter

            }

        } else {

            if (getSettings().getBuiltInZoomControls()

            if (mWebViewCore != null && getSettings().getBuiltInZoomControls()

                    && !getZoomButtonsController().isVisible()) {

                /*

                 * The zoom controls come in their own window, so our window