diff options
| author | Chiachang Wang <chiachangwang@google.com> | 2020-07-03 08:07:04 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-07-03 08:07:04 +0000 |
| commit | 442cffc1763fa0147ea2d30e36ef7b37ee57b38e (patch) | |
| tree | 8b7512fee4d1bd63da72ec390143180613a23265 /src/com | |
| parent | c5c294b9da48b21e525b326184ecc019f2751b17 (diff) | |
| parent | b002fd1e07d040b9c08852f63cfee2dbb7e811fe (diff) | |
Merge "Update CapportData in CapportApiProbeResult to be nullable" into rvc-dev
Diffstat (limited to 'src/com')
| -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 8493816..b6b1fff 100755 --- a/src/com/android/server/connectivity/NetworkMonitor.java +++ b/src/com/android/server/connectivity/NetworkMonitor.java @@ -2628,7 +2628,7 @@ public class NetworkMonitor extends StateMachine { validationLog("Missing user-portal-url from capport response"); return new CapportApiProbeResult( sendDnsAndHttpProbes(mProxy, mUrl, ValidationProbeEvent.PROBE_HTTP), - capportData); + null /* capportData */); } final String loginUrlString = capportData.getUserPortalUrl().toString(); // Starting from R (where CaptivePortalData was introduced), the captive portal app |