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

Commit 9161b5e8 authored by Mark Chien's avatar Mark Chien Committed by android-build-merger
Browse files

Merge "Fix captive portal can't show certificate problem" am: 1bbb08b8 am:...

Merge "Fix captive portal can't show certificate problem" am: 1bbb08b8 am: 060b94c6 am: c0274d13
am: d675290d

Change-Id: I2656bb709cb0bf259279ca75ad8411cd8c92fb43
parents d814bcc8 d675290d
Loading
Loading
Loading
Loading
+4 −1
Original line number Diff line number Diff line
@@ -485,7 +485,10 @@ public class CaptivePortalLoginActivity extends Activity {
            if (request.isForMainFrame()) {
                mMainFrameUrl = request.getUrl().toString();
            }
            return false;
            // Be careful that two shouldOverrideUrlLoading methods are overridden, but
            // shouldOverrideUrlLoading(WebView view, String url) was deprecated in API level 24.
            // TODO: delete deprecated one ??
            return shouldOverrideUrlLoading(view, mMainFrameUrl);
        }

        // A web page consisting of a large broken lock icon to indicate SSL failure.