diff options
| author | Chiachang Wang <chiachangwang@google.com> | 2020-07-03 08:32:31 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-03 08:32:31 +0000 |
| commit | cc94da9a6a1713efd3f867b80ce0441a1bb6057c (patch) | |
| tree | b6b5ce375d4b7ebd342de4bc39258725ac2df3d6 /src | |
| parent | a205d4b7a2444754a8f435e197c4f1434bf5f842 (diff) | |
| parent | 4412473e2679937dc5b0632da60827fe5a5111b0 (diff) | |
Merge "Update CapportData in CapportApiProbeResult to be nullable" into rvc-dev am: 442cffc176 am: 4412473e26
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/11790986
Change-Id: I42d78cdd71b17b7ec3b3f833fa272955269e3e5f
Diffstat (limited to 'src')
| -rw-r--r-- | src/android/net/captiveportal/CapportApiProbeResult.java | 5 | ||||
| -rwxr-xr-x | src/com/android/server/connectivity/NetworkMonitor.java | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/android/net/captiveportal/CapportApiProbeResult.java b/src/android/net/captiveportal/CapportApiProbeResult.java index f693bed..e35b791 100644 --- a/src/android/net/captiveportal/CapportApiProbeResult.java +++ b/src/android/net/captiveportal/CapportApiProbeResult.java @@ -25,11 +25,12 @@ import com.android.networkstack.apishim.common.CaptivePortalDataShim; * @hide */ public class CapportApiProbeResult extends CaptivePortalProbeResult { - @NonNull + // CaptivePortalData may be null if the capport API does not send any valid reply. + @Nullable private final CaptivePortalDataShim mCapportData; public CapportApiProbeResult(@NonNull CaptivePortalProbeResult result, - @NonNull CaptivePortalDataShim capportData) { + @Nullable CaptivePortalDataShim capportData) { this(result.mHttpResponseCode, result.redirectUrl, result.detectUrl, capportData, result.probeType); } 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 |