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

Commit 1302494b authored by markchien's avatar markchien
Browse files

Fix captive portal can't show certificate problem 

Captive portal overrides two shouldOverrideUrlLoading methods,
but show certificate logic only be implemented in deprecated one.

Bug: 133714666
Test: -build, flash, boot
      -atest FramworksNetTests
      -manual test

Change-Id: Ibdcfb814d9552563416fc30b314916559862c361
parent 1c6fb830

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.