Merge "Fix captive portal can't show certificate problem" am: 1bbb08b87f am: 060b94c618 am: c0274d1315

am: d675290dc3

Change-Id: I2656bb709cb0bf259279ca75ad8411cd8c92fb43

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

@@ -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.