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" into qt-dev

Browse Source 
am: 709c46a60a

Change-Id: I7be4156a93dce713d73adfd4f8053749219cd61b
This commit is contained in:
Mark Chien
2019-05-30 02:19:38 -07:00
committed by android-build-merger
parent 38c6070357 709c46a60a
commit 978f5fd2fa
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.