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

Commit cf8c92b0 authored by Junyu Lai's avatar Junyu Lai Committed by Automerger Merge Worker
Browse files

Merge "Fix cannot find removeUnwantedCapability on R device" am: 5b477acb am: ca8859da 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1649302

Change-Id: Ia574c52344290f5baf5fbee90ed1f6f7c7e0f92c
parents 008ba7a6 ca8859da

tests/net/common/java/android/net/NetworkCapabilitiesTest.java

+4 −3
Original line number Diff line number Diff line
@@ -612,17 +612,18 @@ public class NetworkCapabilitiesTest { 
            // From S, it is not allowed to have the same capability in both wanted and

            // unwanted list.

            assertThrows(IllegalArgumentException.class, () -> nc2.combineCapabilities(nc1));

            // Remove unwanted capability to continue other tests.

            nc1.removeUnwantedCapability(NET_CAPABILITY_NOT_ROAMING);

        } else {

            nc2.combineCapabilities(nc1);

            // We will get this capability in both requested and unwanted lists thus this request

            // will never be satisfied.

            assertTrue(nc2.hasCapability(NET_CAPABILITY_NOT_ROAMING));

            assertTrue(nc2.hasUnwantedCapability(NET_CAPABILITY_NOT_ROAMING));

            // For R or below, remove unwanted capability via removeCapability.

            nc1.removeCapability(NET_CAPABILITY_NOT_ROAMING);

        }



        // Remove unwanted capability to continue other tests.

        nc1.removeUnwantedCapability(NET_CAPABILITY_NOT_ROAMING);



        nc1.setSSID(TEST_SSID);

        nc2.combineCapabilities(nc1);

        if (isAtLeastR()) {