diff options
| author | 2018-03-28 05:00:39 +0000 | |
|---|---|---|
| committer | 2018-03-28 05:00:39 +0000 | |
| commit | 601861fd1cce308320ebe21e47a48e0c9c68de55 (patch) | |
| tree | 6b152064b24e8cf925d2ac1e93aafa46a4708259 | |
| parent | ace8e0263367ad88363159b7c05ef18d448ffe23 (diff) | |
| parent | ce68c5d6154d482d77434bf65a3f65ec20fc4372 (diff) | |
Merge "Merge "Minor clean-up in NetworkCapabilities" am: 539f85a18d am: b1e2bfe4df am: 8a956a5141" into pi-dev
| -rw-r--r-- | core/java/android/net/NetworkCapabilities.java | 1 | ||||
| -rw-r--r-- | tests/net/java/android/net/NetworkCapabilitiesTest.java | 14 |
2 files changed, 6 insertions, 9 deletions
diff --git a/core/java/android/net/NetworkCapabilities.java b/core/java/android/net/NetworkCapabilities.java index ef58f94e70cf..ff5714b38212 100644 --- a/core/java/android/net/NetworkCapabilities.java +++ b/core/java/android/net/NetworkCapabilities.java @@ -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; diff --git a/tests/net/java/android/net/NetworkCapabilitiesTest.java b/tests/net/java/android/net/NetworkCapabilitiesTest.java index c86637186342..941c94de9f92 100644 --- a/tests/net/java/android/net/NetworkCapabilitiesTest.java +++ b/tests/net/java/android/net/NetworkCapabilitiesTest.java @@ -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)); } |