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

Commit 601861fd authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Merge "Minor clean-up in NetworkCapabilities" am: 539f85a1 am:... 

Merge "Merge "Minor clean-up in NetworkCapabilities" am: 539f85a1 am: b1e2bfe4 am: 8a956a51" into pi-dev
parents ace8e026 ce68c5d6

core/java/android/net/NetworkCapabilities.java

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package android.net;



import android.annotation.IntDef;

import android.annotation.SystemApi;

import android.net.ConnectivityManager.NetworkCallback;

import android.os.Parcel;

import android.os.Parcelable;

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

+6 −8
Original line number Diff line number Diff line
@@ -315,28 +315,26 @@ public class NetworkCapabilitiesTest { 


    @Test

    public void testEqualsNetCapabilities() {

        int CAPABILITY = NET_CAPABILITY_MMS;  // An arbitrary not mutable capability.



        NetworkCapabilities nc1 = new NetworkCapabilities();

        NetworkCapabilities nc2 = new NetworkCapabilities();

        assertTrue(nc1.equalsNetCapabilities(nc2));

        assertEquals(nc1, nc2);



        nc1.addCapability(CAPABILITY);

        nc1.addCapability(NET_CAPABILITY_MMS);

        assertFalse(nc1.equalsNetCapabilities(nc2));

        assertNotEquals(nc1, nc2);

        nc2.addCapability(CAPABILITY);

        nc2.addCapability(NET_CAPABILITY_MMS);

        assertTrue(nc1.equalsNetCapabilities(nc2));

        assertEquals(nc1, nc2);



        nc1.addUnwantedCapability(CAPABILITY);

        nc1.addUnwantedCapability(NET_CAPABILITY_INTERNET);

        assertFalse(nc1.equalsNetCapabilities(nc2));

        nc2.addUnwantedCapability(CAPABILITY);

        nc2.addUnwantedCapability(NET_CAPABILITY_INTERNET);

        assertTrue(nc1.equalsNetCapabilities(nc2));



        nc1.removeCapability(CAPABILITY);

        nc1.removeCapability(NET_CAPABILITY_INTERNET);

        assertFalse(nc1.equalsNetCapabilities(nc2));

        nc2.removeCapability(CAPABILITY);

        nc2.removeCapability(NET_CAPABILITY_INTERNET);

        assertTrue(nc1.equalsNetCapabilities(nc2));

    }