diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-03-07 21:06:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-03-07 21:06:59 +0000 |
| commit | 539f85a18d8ae7e87e0ed2bff7c1744a533e072d (patch) | |
| tree | e526c33f788c8a5d013f643f868c9b76460f07b8 | |
| parent | b5fb7e91d8c3644c6dbc9ab6c2de5e1bc47aa91c (diff) | |
| parent | 86ec08d8207885949ff98d5c6f7c4b393b03db41 (diff) | |
| download | base-539f85a18d8ae7e87e0ed2bff7c1744a533e072d.tar.gz | |
Merge "Minor clean-up in NetworkCapabilities"
| -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 4be01d0abd94..2fc8c6857b75 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 caaa6109f0e6..17932a4eb165 100644 --- a/tests/net/java/android/net/NetworkCapabilitiesTest.java +++ b/tests/net/java/android/net/NetworkCapabilitiesTest.java @@ -324,28 +324,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)); } |