From 51f4d8a11da898b2caef9966571453e37dead823 Mon Sep 17 00:00:00 2001 From: Pavel Maltsev Date: Wed, 7 Mar 2018 23:40:32 +0000 Subject: [PATCH] Merge "Minor clean-up in NetworkCapabilities" am: 539f85a18d am: b1e2bfe4df am: 8a956a5141 Bug: 72828388 Test: frameworks/base/tests/net/ -c android.net.NetworkCapabilitiesTest Change-Id: I2f45d2c70c7c0142ae3b3ce9e6329c5f25b63380 (cherry picked from commit feb8d1498a822730e29cf346fe3382e3f5293a58) --- core/java/android/net/NetworkCapabilities.java | 1 - .../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 ef58f94e70..ff5714b382 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 c866371863..941c94de9f 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)); }