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

Commit 88ca3095 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by Automerger Merge Worker
Browse files

Fix NetworkMonitorTest on Q am: 38b1a384 am: 130f6706 am: f45cc4f2 

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

Change-Id: I70cc9c907bbbe2e8d0794324a31946c238e5c17d
parents 5dc6ccb3 f45cc4f2

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

+6 −4
Original line number Diff line number Diff line
@@ -1813,26 +1813,28 @@ public class NetworkMonitorTest { 


    @Test

    public void testNoTrustedCapabilityValidated() throws Exception {

        final NetworkCapabilities.Builder nc = new NetworkCapabilities.Builder()

        // Cannot use the NetworkCapabilities builder on Q

        final NetworkCapabilities nc = new NetworkCapabilities()

                .addCapability(NET_CAPABILITY_INTERNET)

                .removeCapability(NET_CAPABILITY_TRUSTED)

                .addTransportType(TRANSPORT_CELLULAR);

        if (ShimUtils.isAtLeastS()) {

            nc.addCapability(NET_CAPABILITY_NOT_VCN_MANAGED);

        }

        doValidationSkippedTest(nc.build());

        doValidationSkippedTest(nc);

    }



    @Test

    public void testRestrictedCapabilityValidated() throws Exception {

        final NetworkCapabilities.Builder nc = new NetworkCapabilities.Builder()

        // Cannot use the NetworkCapabilities builder on Q

        final NetworkCapabilities nc = new NetworkCapabilities()

                .addCapability(NET_CAPABILITY_INTERNET)

                .removeCapability(NET_CAPABILITY_NOT_RESTRICTED)

                .addTransportType(TRANSPORT_CELLULAR);

        if (ShimUtils.isAtLeastS()) {

            nc.addCapability(NET_CAPABILITY_NOT_VCN_MANAGED);

        }

        doValidationSkippedTest(nc.build());

        doValidationSkippedTest(nc);

    }



    private NetworkCapabilities getVcnUnderlyingCarrierWifiCaps() {