Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cc94da9a authored by Chiachang Wang's avatar Chiachang Wang Committed by Automerger Merge Worker
Browse files

Merge "Update CapportData in CapportApiProbeResult to be nullable" into... 

Merge "Update CapportData in CapportApiProbeResult to be nullable" into rvc-dev am: 442cffc1 am: 4412473e

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/11790986

Change-Id: I42d78cdd71b17b7ec3b3f833fa272955269e3e5f
parents a205d4b7 4412473e

src/android/net/captiveportal/CapportApiProbeResult.java

+3 −2
Original line number Diff line number Diff line
@@ -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);

    }

src/com/android/server/connectivity/NetworkMonitor.java

+1 −1
Original line number Diff line number Diff line
@@ -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

tests/unit/src/com/android/server/connectivity/NetworkMonitorTest.java

+23 −1
Original line number Diff line number Diff line
@@ -1152,7 +1152,29 @@ public class NetworkMonitorTest { 
    }



    @Test

    public void testIsCaptivePortal_CapportApiIsPortal() throws Exception {

    public void testIsCaptivePortal_CapportApiIsPortalWithNullPortalUrl() throws Exception {

        assumeTrue(CaptivePortalDataShimImpl.isSupported());

        setSslException(mHttpsConnection);

        final long bytesRemaining = 10_000L;

        final long secondsRemaining = 500L;

        // Set content without partal url.

        setApiContent(mCapportApiConnection, "{'captive': true,"

                + "'venue-info-url': '" + TEST_VENUE_INFO_URL + "',"

                + "'bytes-remaining': " + bytesRemaining + ","

                + "'seconds-remaining': " + secondsRemaining + "}");

        setPortal302(mHttpConnection);



        runNetworkTest(makeCapportLPs(), CELL_METERED_CAPABILITIES, VALIDATION_RESULT_PORTAL,

                0 /* probesSucceeded*/, TEST_LOGIN_URL);



        verify(mCapportApiConnection).getResponseCode();



        verify(mHttpConnection, times(1)).getResponseCode();

        verify(mCallbacks, never()).notifyCaptivePortalDataChanged(any());

    }



    @Test

    public void testIsCaptivePortal_CapportApiIsPortalWithValidPortalUrl() throws Exception {

        assumeTrue(CaptivePortalDataShimImpl.isSupported());

        setSslException(mHttpsConnection);

        final long bytesRemaining = 10_000L;