LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Minor clean-up in NetworkCapabilities"

Browse Source
This commit is contained in:
Treehugger Robot
2018-03-07 21:06:59 +00:00
committed by Gerrit Code Review
parent 09639d8ad0 15e839f111
commit 1dd43b192c
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/java/android/net/NetworkCapabilities.java
View File

@@ -17,7 +17,6 @@
package android.net; package android.net;
import android.annotation.IntDef; import android.annotation.IntDef;
import android.annotation.SystemApi;
import android.net.ConnectivityManager.NetworkCallback; import android.net.ConnectivityManager.NetworkCallback;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;

14
tests/net/java/android/net/NetworkCapabilitiesTest.java
View File

@@ -324,28 +324,26 @@ public class NetworkCapabilitiesTest {
@Test @Test
public void testEqualsNetCapabilities() { public void testEqualsNetCapabilities() {
int CAPABILITY = NET_CAPABILITY_MMS; // An arbitrary not mutable capability.
NetworkCapabilities nc1 = new NetworkCapabilities(); NetworkCapabilities nc1 = new NetworkCapabilities();
NetworkCapabilities nc2 = new NetworkCapabilities(); NetworkCapabilities nc2 = new NetworkCapabilities();
assertTrue(nc1.equalsNetCapabilities(nc2)); assertTrue(nc1.equalsNetCapabilities(nc2));
assertEquals(nc1, nc2); assertEquals(nc1, nc2);
nc1.addCapability(CAPABILITY); nc1.addCapability(NET_CAPABILITY_MMS);
assertFalse(nc1.equalsNetCapabilities(nc2)); assertFalse(nc1.equalsNetCapabilities(nc2));
assertNotEquals(nc1, nc2); assertNotEquals(nc1, nc2);
nc2.addCapability(CAPABILITY); nc2.addCapability(NET_CAPABILITY_MMS);
assertTrue(nc1.equalsNetCapabilities(nc2)); assertTrue(nc1.equalsNetCapabilities(nc2));
assertEquals(nc1, nc2); assertEquals(nc1, nc2);
nc1.addUnwantedCapability(CAPABILITY); nc1.addUnwantedCapability(NET_CAPABILITY_INTERNET);
assertFalse(nc1.equalsNetCapabilities(nc2)); assertFalse(nc1.equalsNetCapabilities(nc2));
nc2.addUnwantedCapability(CAPABILITY); nc2.addUnwantedCapability(NET_CAPABILITY_INTERNET);
assertTrue(nc1.equalsNetCapabilities(nc2)); assertTrue(nc1.equalsNetCapabilities(nc2));
nc1.removeCapability(CAPABILITY); nc1.removeCapability(NET_CAPABILITY_INTERNET);
assertFalse(nc1.equalsNetCapabilities(nc2)); assertFalse(nc1.equalsNetCapabilities(nc2));
nc2.removeCapability(CAPABILITY); nc2.removeCapability(NET_CAPABILITY_INTERNET);
assertTrue(nc1.equalsNetCapabilities(nc2)); assertTrue(nc1.equalsNetCapabilities(nc2));
} }