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

Commit 1bbb08b8 authored by Mark Chien's avatar Mark Chien Committed by Gerrit Code Review
Browse files

Merge "Fix captive portal can't show certificate problem"

parents 4fb04e8b 1302494b

packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java

+4 −1
Original line number Diff line number Diff line
@@ -484,7 +484,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.