diff options
| author | Chiachang Wang <chiachangwang@google.com> | 2020-05-29 22:38:12 +0000 |
|---|---|---|
| committer | Chiachang Wang <chiachangwang@google.com> | 2020-06-01 00:48:58 +0000 |
| commit | ffaef4931580b63c3df88b98b54d47012ada70d0 (patch) | |
| tree | 20008b073f5ca6afea42846597616319e6cabcf2 /src | |
| parent | 1e2e741071140b5f911db91b2008bda8dbdb732e (diff) | |
Fallback if redirect url is not valid for captive portal login
Wifi AP may send a relative URL or other invalid URL if any
network issue or configuration issue happen. In this kind of
case, sending a redirect url to captive portal app will fail
to open the login page. Thus, fallback to send detection url
if the redirect url is a malformed URL.
Bug: 157433005
Test: atest NetworkStackTest
Merged-In: I6126f5aeb4709a09ec249947b5e59f1310ec7a4b
Change-Id: I6126f5aeb4709a09ec249947b5e59f1310ec7a4b
Diffstat (limited to 'src')
| -rwxr-xr-x | src/com/android/server/connectivity/NetworkMonitor.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/server/connectivity/NetworkMonitor.java b/src/com/android/server/connectivity/NetworkMonitor.java index 8a1b0c7..3298b03 100755 --- a/src/com/android/server/connectivity/NetworkMonitor.java +++ b/src/com/android/server/connectivity/NetworkMonitor.java @@ -1090,7 +1090,7 @@ public class NetworkMonitor extends StateMachine { final CaptivePortalProbeResult probeRes = mLastPortalProbeResult; // Use redirect URL from AP if exists. final String portalUrl = - (useRedirectUrlForPortal() && probeRes.redirectUrl != null) + (useRedirectUrlForPortal() && makeURL(probeRes.redirectUrl) != null) ? probeRes.redirectUrl : probeRes.detectUrl; appExtras.putString(EXTRA_CAPTIVE_PORTAL_URL, portalUrl); if (probeRes.probeSpec != null) { |