Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: c0274d1315

Change-Id: I7640d2eec7e2d660a99ac617381259ad8379c340
This commit is contained in:
Mark Chien
2019-05-29 19:35:59 -07:00
committed by android-build-merger
parent b6bafcd43e c0274d1315
commit d675290dc3
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java
View File

@@ -485,7 +485,10 @@ public class CaptivePortalLoginActivity extends Activity {
if (request.isForMainFrame()) { if (request.isForMainFrame()) {
mMainFrameUrl = request.getUrl().toString(); 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. // A web page consisting of a large broken lock icon to indicate SSL failure.