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

Commit c439d8b2 authored by Lucas Lin's avatar Lucas Lin Committed by Automerger Merge Worker
Browse files

Merge "Fix NetworkCapabilitiesTest fail on Q device" into rvc-dev am: a5f08bda am: 969e191f 

Change-Id: I97db0c4a2a33398ba9bf98665655a46931d9a43c
parents 707d78db 969e191f

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

+9 −3
Original line number Diff line number Diff line
@@ -463,7 +463,9 @@ public class NetworkCapabilitiesTest { 


        nc1.setSSID(TEST_SSID);

        nc2.combineCapabilities(nc1);

        if (isAtLeastR()) {

            assertTrue(TEST_SSID.equals(nc2.getSsid()));

        }



        // Because they now have the same SSID, the following call should not throw

        nc2.combineCapabilities(nc1);
@@ -601,12 +603,16 @@ public class NetworkCapabilitiesTest { 
        // from nc2.

        assertFalse(nc2.hasCapability(NET_CAPABILITY_NOT_ROAMING));

        assertTrue(nc2.hasUnwantedCapability(NET_CAPABILITY_NOT_ROAMING));

        if (isAtLeastR()) {

            assertTrue(TEST_SSID.equals(nc2.getSsid()));

        }



        nc1.setSSID(DIFFERENT_TEST_SSID);

        nc2.set(nc1);

        assertEquals(nc1, nc2);

        if (isAtLeastR()) {

            assertTrue(DIFFERENT_TEST_SSID.equals(nc2.getSsid()));

        }



        nc1.setUids(uidRange(10, 13));

        nc2.set(nc1);  // Overwrites, as opposed to combineCapabilities