diff --git a/tests/unit/java/android/app/usage/NetworkStatsManagerTest.java b/tests/unit/java/android/app/usage/NetworkStatsManagerTest.java index be95b6ce9e..6bd2bd569f 100644 --- a/tests/unit/java/android/app/usage/NetworkStatsManagerTest.java +++ b/tests/unit/java/android/app/usage/NetworkStatsManagerTest.java @@ -36,11 +36,9 @@ import android.net.INetworkStatsSession; import android.net.NetworkStats.Entry; import android.net.NetworkStatsHistory; import android.net.NetworkTemplate; -import android.os.Build; import android.os.RemoteException; import androidx.test.InstrumentationRegistry; -import androidx.test.filters.SdkSuppress; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -53,7 +51,6 @@ import org.mockito.invocation.InvocationOnMock; @RunWith(AndroidJUnit4.class) @SmallTest -@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") public class NetworkStatsManagerTest { private static final String TEST_SUBSCRIBER_ID = "subid"; diff --git a/tests/unit/java/android/net/ConnectivityManagerTest.java b/tests/unit/java/android/net/ConnectivityManagerTest.java index b36e3799c8..b8cd3f68d0 100644 --- a/tests/unit/java/android/net/ConnectivityManagerTest.java +++ b/tests/unit/java/android/net/ConnectivityManagerTest.java @@ -59,7 +59,6 @@ import android.app.PendingIntent; import android.content.Context; import android.content.pm.ApplicationInfo; import android.net.ConnectivityManager.NetworkCallback; -import android.os.Build; import android.os.Build.VERSION_CODES; import android.os.Bundle; import android.os.Handler; @@ -68,7 +67,6 @@ import android.os.Message; import android.os.Messenger; import android.os.Process; -import androidx.test.filters.SdkSuppress; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -81,7 +79,6 @@ import org.mockito.MockitoAnnotations; @RunWith(AndroidJUnit4.class) @SmallTest -@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") public class ConnectivityManagerTest { @Mock Context mCtx; diff --git a/tests/unit/java/android/net/Ikev2VpnProfileTest.java b/tests/unit/java/android/net/Ikev2VpnProfileTest.java index afd85e86a7..0707ef3ed1 100644 --- a/tests/unit/java/android/net/Ikev2VpnProfileTest.java +++ b/tests/unit/java/android/net/Ikev2VpnProfileTest.java @@ -23,10 +23,8 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import android.os.Build; import android.test.mock.MockContext; -import androidx.test.filters.SdkSuppress; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -54,7 +52,6 @@ import javax.security.auth.x500.X500Principal; /** Unit tests for {@link Ikev2VpnProfile.Builder}. */ @SmallTest @RunWith(AndroidJUnit4.class) -@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") public class Ikev2VpnProfileTest { private static final String SERVER_ADDR_STRING = "1.2.3.4"; private static final String IDENTITY_STRING = "Identity"; diff --git a/tests/unit/java/android/net/IpMemoryStoreTest.java b/tests/unit/java/android/net/IpMemoryStoreTest.java index 6be5396425..0b13800bc5 100644 --- a/tests/unit/java/android/net/IpMemoryStoreTest.java +++ b/tests/unit/java/android/net/IpMemoryStoreTest.java @@ -36,10 +36,8 @@ import android.net.ipmemorystore.NetworkAttributes; import android.net.ipmemorystore.NetworkAttributesParcelable; import android.net.ipmemorystore.Status; import android.net.networkstack.ModuleNetworkStackClient; -import android.os.Build; import android.os.RemoteException; -import androidx.test.filters.SdkSuppress; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -57,7 +55,6 @@ import java.util.Arrays; @RunWith(AndroidJUnit4.class) @SmallTest -@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") public class IpMemoryStoreTest { private static final String TAG = IpMemoryStoreTest.class.getSimpleName(); private static final String TEST_CLIENT_ID = "testClientId"; diff --git a/tests/unit/java/android/net/IpSecAlgorithmTest.java b/tests/unit/java/android/net/IpSecAlgorithmTest.java index fc08408af2..3a8d6004f6 100644 --- a/tests/unit/java/android/net/IpSecAlgorithmTest.java +++ b/tests/unit/java/android/net/IpSecAlgorithmTest.java @@ -28,7 +28,6 @@ import android.content.res.Resources; import android.os.Build; import android.os.Parcel; -import androidx.test.filters.SdkSuppress; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -47,7 +46,6 @@ import java.util.Set; /** Unit tests for {@link IpSecAlgorithm}. */ @SmallTest @RunWith(AndroidJUnit4.class) -@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") public class IpSecAlgorithmTest { private static final byte[] KEY_MATERIAL; diff --git a/tests/unit/java/android/net/IpSecConfigTest.java b/tests/unit/java/android/net/IpSecConfigTest.java index 457c92372c..25e225ef30 100644 --- a/tests/unit/java/android/net/IpSecConfigTest.java +++ b/tests/unit/java/android/net/IpSecConfigTest.java @@ -23,9 +23,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotSame; import static org.junit.Assert.assertNull; -import android.os.Build; - -import androidx.test.filters.SdkSuppress; import androidx.test.filters.SmallTest; import org.junit.Test; @@ -35,7 +32,6 @@ import org.junit.runners.JUnit4; /** Unit tests for {@link IpSecConfig}. */ @SmallTest @RunWith(JUnit4.class) -@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") public class IpSecConfigTest { @Test diff --git a/tests/unit/java/android/net/IpSecManagerTest.java b/tests/unit/java/android/net/IpSecManagerTest.java index 3fd0064460..730e2d56bd 100644 --- a/tests/unit/java/android/net/IpSecManagerTest.java +++ b/tests/unit/java/android/net/IpSecManagerTest.java @@ -31,11 +31,9 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import android.os.Build; import android.system.Os; import android.test.mock.MockContext; -import androidx.test.filters.SdkSuppress; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -52,7 +50,6 @@ import java.net.UnknownHostException; /** Unit tests for {@link IpSecManager}. */ @SmallTest @RunWith(AndroidJUnit4.class) -@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") public class IpSecManagerTest { private static final int TEST_UDP_ENCAP_PORT = 34567; diff --git a/tests/unit/java/android/net/IpSecTransformTest.java b/tests/unit/java/android/net/IpSecTransformTest.java index 96b09c31da..424f23dbba 100644 --- a/tests/unit/java/android/net/IpSecTransformTest.java +++ b/tests/unit/java/android/net/IpSecTransformTest.java @@ -19,9 +19,6 @@ package android.net; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; -import android.os.Build; - -import androidx.test.filters.SdkSuppress; import androidx.test.filters.SmallTest; import org.junit.Test; @@ -31,7 +28,6 @@ import org.junit.runners.JUnit4; /** Unit tests for {@link IpSecTransform}. */ @SmallTest @RunWith(JUnit4.class) -@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") public class IpSecTransformTest { @Test diff --git a/tests/unit/java/android/net/KeepalivePacketDataUtilTest.java b/tests/unit/java/android/net/KeepalivePacketDataUtilTest.java index 3fcb515d97..bc6dbf21d5 100644 --- a/tests/unit/java/android/net/KeepalivePacketDataUtilTest.java +++ b/tests/unit/java/android/net/KeepalivePacketDataUtilTest.java @@ -24,11 +24,8 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import android.net.util.KeepalivePacketDataUtil; -import android.os.Build; import android.util.Log; -import androidx.test.filters.SdkSuppress; - import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -39,7 +36,6 @@ import java.net.InetAddress; import java.nio.ByteBuffer; @RunWith(JUnit4.class) -@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") public final class KeepalivePacketDataUtilTest { private static final byte[] IPV4_KEEPALIVE_SRC_ADDR = {10, 0, 0, 1}; private static final byte[] IPV4_KEEPALIVE_DST_ADDR = {10, 0, 0, 5}; diff --git a/tests/unit/java/android/net/MacAddressTest.java b/tests/unit/java/android/net/MacAddressTest.java index 0039e44fa5..6de31f6b4b 100644 --- a/tests/unit/java/android/net/MacAddressTest.java +++ b/tests/unit/java/android/net/MacAddressTest.java @@ -22,9 +22,6 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import android.os.Build; - -import androidx.test.filters.SdkSuppress; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -39,7 +36,6 @@ import java.util.Random; @SmallTest @RunWith(AndroidJUnit4.class) -@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") public class MacAddressTest { static class AddrTypeTestCase { diff --git a/tests/unit/java/android/net/NetworkIdentityTest.kt b/tests/unit/java/android/net/NetworkIdentityTest.kt index 4d04b19e4d..eb2b85c145 100644 --- a/tests/unit/java/android/net/NetworkIdentityTest.kt +++ b/tests/unit/java/android/net/NetworkIdentityTest.kt @@ -20,15 +20,12 @@ import android.net.NetworkIdentity.OEM_NONE import android.net.NetworkIdentity.OEM_PAID import android.net.NetworkIdentity.OEM_PRIVATE import android.net.NetworkIdentity.getOemBitfield -import android.os.Build -import androidx.test.filters.SdkSuppress import org.junit.Test import org.junit.runner.RunWith import org.junit.runners.JUnit4 import kotlin.test.assertEquals @RunWith(JUnit4::class) -@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") class NetworkIdentityTest { @Test fun testGetOemBitfield() { diff --git a/tests/unit/java/android/net/NetworkStatsHistoryTest.java b/tests/unit/java/android/net/NetworkStatsHistoryTest.java index 3ecce505ef..13558cd51c 100644 --- a/tests/unit/java/android/net/NetworkStatsHistoryTest.java +++ b/tests/unit/java/android/net/NetworkStatsHistoryTest.java @@ -38,11 +38,9 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import android.content.Context; -import android.os.Build; import android.util.Log; import androidx.test.InstrumentationRegistry; -import androidx.test.filters.SdkSuppress; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -60,7 +58,6 @@ import java.util.Random; @RunWith(AndroidJUnit4.class) @SmallTest -@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") public class NetworkStatsHistoryTest { private static final String TAG = "NetworkStatsHistoryTest"; diff --git a/tests/unit/java/android/net/NetworkStatsTest.java b/tests/unit/java/android/net/NetworkStatsTest.java index 9a3f4c2111..23d5a7e5d5 100644 --- a/tests/unit/java/android/net/NetworkStatsTest.java +++ b/tests/unit/java/android/net/NetworkStatsTest.java @@ -39,11 +39,9 @@ import static android.net.NetworkStats.UID_ALL; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import android.os.Build; import android.os.Process; import android.util.ArrayMap; -import androidx.test.filters.SdkSuppress; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -57,7 +55,6 @@ import java.util.HashSet; @RunWith(AndroidJUnit4.class) @SmallTest -@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") public class NetworkStatsTest { private static final String TEST_IFACE = "test0"; diff --git a/tests/unit/java/android/net/NetworkTemplateTest.kt b/tests/unit/java/android/net/NetworkTemplateTest.kt index 437f96160e..cb39a0c819 100644 --- a/tests/unit/java/android/net/NetworkTemplateTest.kt +++ b/tests/unit/java/android/net/NetworkTemplateTest.kt @@ -42,9 +42,7 @@ import android.net.NetworkTemplate.buildTemplateWifi import android.net.NetworkTemplate.buildTemplateWifiWildcard import android.net.NetworkTemplate.buildTemplateCarrierMetered import android.net.NetworkTemplate.buildTemplateMobileWithRatType -import android.os.Build import android.telephony.TelephonyManager -import androidx.test.filters.SdkSuppress import com.android.testutils.assertParcelSane import org.junit.Before import org.junit.Test @@ -63,7 +61,6 @@ private const val TEST_SSID1 = "ssid1" private const val TEST_SSID2 = "ssid2" @RunWith(JUnit4::class) -@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") class NetworkTemplateTest { private val mockContext = mock(Context::class.java) diff --git a/tests/unit/java/android/net/NetworkUtilsTest.java b/tests/unit/java/android/net/NetworkUtilsTest.java index b2929987ec..7748288aeb 100644 --- a/tests/unit/java/android/net/NetworkUtilsTest.java +++ b/tests/unit/java/android/net/NetworkUtilsTest.java @@ -18,9 +18,6 @@ package android.net; import static junit.framework.Assert.assertEquals; -import android.os.Build; - -import androidx.test.filters.SdkSuppress; import androidx.test.runner.AndroidJUnit4; import org.junit.Test; @@ -31,7 +28,6 @@ import java.util.TreeSet; @RunWith(AndroidJUnit4.class) @androidx.test.filters.SmallTest -@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") public class NetworkUtilsTest { @Test public void testRoutedIPv4AddressCount() { diff --git a/tests/unit/java/android/net/QosSocketFilterTest.java b/tests/unit/java/android/net/QosSocketFilterTest.java index 1635c34935..40f8f1b8d0 100644 --- a/tests/unit/java/android/net/QosSocketFilterTest.java +++ b/tests/unit/java/android/net/QosSocketFilterTest.java @@ -19,9 +19,6 @@ package android.net; import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; -import android.os.Build; - -import androidx.test.filters.SdkSuppress; import androidx.test.runner.AndroidJUnit4; import org.junit.Test; @@ -32,7 +29,6 @@ import java.net.InetSocketAddress; @RunWith(AndroidJUnit4.class) @androidx.test.filters.SmallTest -@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") public class QosSocketFilterTest { @Test diff --git a/tests/unit/java/android/net/TelephonyNetworkSpecifierTest.java b/tests/unit/java/android/net/TelephonyNetworkSpecifierTest.java index e198c8b6ad..6714bb1abb 100644 --- a/tests/unit/java/android/net/TelephonyNetworkSpecifierTest.java +++ b/tests/unit/java/android/net/TelephonyNetworkSpecifierTest.java @@ -23,10 +23,8 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import android.net.wifi.WifiNetworkSpecifier; -import android.os.Build; import android.telephony.SubscriptionManager; -import androidx.test.filters.SdkSuppress; import androidx.test.filters.SmallTest; import org.junit.Test; @@ -35,7 +33,6 @@ import org.junit.Test; * Unit test for {@link android.net.TelephonyNetworkSpecifier}. */ @SmallTest -@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") public class TelephonyNetworkSpecifierTest { private static final int TEST_SUBID = 5; private static final String TEST_SSID = "Test123"; diff --git a/tests/unit/java/android/net/VpnManagerTest.java b/tests/unit/java/android/net/VpnManagerTest.java index b4d850ac3c..3135062138 100644 --- a/tests/unit/java/android/net/VpnManagerTest.java +++ b/tests/unit/java/android/net/VpnManagerTest.java @@ -27,11 +27,9 @@ import static org.mockito.Mockito.when; import android.content.ComponentName; import android.content.Intent; -import android.os.Build; import android.test.mock.MockContext; import android.util.SparseArray; -import androidx.test.filters.SdkSuppress; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -45,7 +43,6 @@ import org.junit.runner.RunWith; /** Unit tests for {@link VpnManager}. */ @SmallTest @RunWith(AndroidJUnit4.class) -@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") public class VpnManagerTest { private static final String PKG_NAME = "fooPackage"; diff --git a/tests/unit/java/android/net/VpnTransportInfoTest.java b/tests/unit/java/android/net/VpnTransportInfoTest.java index ae2ac046c3..ccaa5cf7e9 100644 --- a/tests/unit/java/android/net/VpnTransportInfoTest.java +++ b/tests/unit/java/android/net/VpnTransportInfoTest.java @@ -24,9 +24,6 @@ import static com.android.testutils.ParcelUtils.assertParcelSane; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; -import android.os.Build; - -import androidx.test.filters.SdkSuppress; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -35,7 +32,6 @@ import org.junit.runner.RunWith; @RunWith(AndroidJUnit4.class) @SmallTest -@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") public class VpnTransportInfoTest { @Test diff --git a/tests/unit/java/android/net/ipmemorystore/ParcelableTests.java b/tests/unit/java/android/net/ipmemorystore/ParcelableTests.java index 219cfffa44..603c875195 100644 --- a/tests/unit/java/android/net/ipmemorystore/ParcelableTests.java +++ b/tests/unit/java/android/net/ipmemorystore/ParcelableTests.java @@ -21,11 +21,9 @@ import static org.junit.Assert.assertTrue; import android.net.networkstack.aidl.quirks.IPv6ProvisioningLossQuirk; import android.net.networkstack.aidl.quirks.IPv6ProvisioningLossQuirkParcelable; -import android.os.Build; import android.os.Parcel; import android.os.Parcelable; -import androidx.test.filters.SdkSuppress; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -40,7 +38,6 @@ import java.util.Collections; @RunWith(AndroidJUnit4.class) @SmallTest -@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") public class ParcelableTests { @Test public void testNetworkAttributesParceling() throws Exception { diff --git a/tests/unit/java/android/net/nsd/NsdManagerTest.java b/tests/unit/java/android/net/nsd/NsdManagerTest.java index 59a9316e5d..370179c2b1 100644 --- a/tests/unit/java/android/net/nsd/NsdManagerTest.java +++ b/tests/unit/java/android/net/nsd/NsdManagerTest.java @@ -28,14 +28,12 @@ import static org.mockito.Mockito.timeout; import static org.mockito.Mockito.verify; import android.content.Context; -import android.os.Build; import android.os.Handler; import android.os.HandlerThread; import android.os.Looper; import android.os.Message; import android.os.Messenger; -import androidx.test.filters.SdkSuppress; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -51,7 +49,6 @@ import org.mockito.MockitoAnnotations; @RunWith(AndroidJUnit4.class) @SmallTest -@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") public class NsdManagerTest { static final int PROTOCOL = NsdManager.PROTOCOL_DNS_SD; diff --git a/tests/unit/java/android/net/nsd/NsdServiceInfoTest.java b/tests/unit/java/android/net/nsd/NsdServiceInfoTest.java index afe54d1133..94dfc7515c 100644 --- a/tests/unit/java/android/net/nsd/NsdServiceInfoTest.java +++ b/tests/unit/java/android/net/nsd/NsdServiceInfoTest.java @@ -21,12 +21,10 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import android.os.Build; import android.os.Bundle; import android.os.Parcel; import android.os.StrictMode; -import androidx.test.filters.SdkSuppress; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -40,7 +38,6 @@ import java.util.Map; @RunWith(AndroidJUnit4.class) @SmallTest -@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") public class NsdServiceInfoTest { public final static InetAddress LOCALHOST; diff --git a/tests/unit/java/android/net/util/DnsUtilsTest.java b/tests/unit/java/android/net/util/DnsUtilsTest.java index 0bac75e238..b626db8d89 100644 --- a/tests/unit/java/android/net/util/DnsUtilsTest.java +++ b/tests/unit/java/android/net/util/DnsUtilsTest.java @@ -25,9 +25,7 @@ import static org.junit.Assert.assertEquals; import android.annotation.NonNull; import android.annotation.Nullable; import android.net.InetAddresses; -import android.os.Build; -import androidx.test.filters.SdkSuppress; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -41,7 +39,6 @@ import java.util.List; @RunWith(AndroidJUnit4.class) @SmallTest -@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") public class DnsUtilsTest { private InetAddress stringToAddress(@NonNull String addr) { return InetAddresses.parseNumericAddress(addr); diff --git a/tests/unit/java/android/net/util/KeepaliveUtilsTest.kt b/tests/unit/java/android/net/util/KeepaliveUtilsTest.kt index 65fb4ed1cc..b62bdbcfb5 100644 --- a/tests/unit/java/android/net/util/KeepaliveUtilsTest.kt +++ b/tests/unit/java/android/net/util/KeepaliveUtilsTest.kt @@ -25,8 +25,6 @@ import android.net.NetworkCapabilities.TRANSPORT_CELLULAR import android.net.NetworkCapabilities.TRANSPORT_ETHERNET import android.net.NetworkCapabilities.TRANSPORT_VPN import android.net.NetworkCapabilities.TRANSPORT_WIFI -import android.os.Build -import androidx.test.filters.SdkSuppress import androidx.test.filters.SmallTest import com.android.internal.R import org.junit.After @@ -49,7 +47,6 @@ import org.mockito.Mockito.mock */ @RunWith(JUnit4::class) @SmallTest -@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") class KeepaliveUtilsTest { // Prepare mocked context with given resource strings. diff --git a/tests/unit/java/android/net/util/MultinetworkPolicyTrackerTest.kt b/tests/unit/java/android/net/util/MultinetworkPolicyTrackerTest.kt index 7d602ab819..78c8fa408c 100644 --- a/tests/unit/java/android/net/util/MultinetworkPolicyTrackerTest.kt +++ b/tests/unit/java/android/net/util/MultinetworkPolicyTrackerTest.kt @@ -25,13 +25,11 @@ import android.net.ConnectivityResources import android.net.ConnectivitySettingsManager.NETWORK_AVOID_BAD_WIFI import android.net.ConnectivitySettingsManager.NETWORK_METERED_MULTIPATH_PREFERENCE import android.net.util.MultinetworkPolicyTracker.ActiveDataSubscriptionIdListener -import android.os.Build import android.provider.Settings import android.telephony.SubscriptionInfo import android.telephony.SubscriptionManager import android.telephony.TelephonyManager import android.test.mock.MockContentResolver -import androidx.test.filters.SdkSuppress import androidx.test.filters.SmallTest import androidx.test.runner.AndroidJUnit4 import com.android.connectivity.resources.R @@ -61,7 +59,6 @@ import org.mockito.Mockito.verify */ @RunWith(AndroidJUnit4::class) @SmallTest -@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") class MultinetworkPolicyTrackerTest { private val resources = mock(Resources::class.java).also { doReturn(R.integer.config_networkAvoidBadWifi).`when`(it).getIdentifier( diff --git a/tests/unit/java/com/android/internal/net/NetworkUtilsInternalTest.java b/tests/unit/java/com/android/internal/net/NetworkUtilsInternalTest.java index a4d8ea9e46..3cfecd5529 100644 --- a/tests/unit/java/com/android/internal/net/NetworkUtilsInternalTest.java +++ b/tests/unit/java/com/android/internal/net/NetworkUtilsInternalTest.java @@ -27,11 +27,9 @@ import static junit.framework.Assert.assertEquals; import static org.junit.Assert.fail; -import android.os.Build; import android.system.ErrnoException; import android.system.Os; -import androidx.test.filters.SdkSuppress; import androidx.test.runner.AndroidJUnit4; import libcore.io.IoUtils; @@ -41,7 +39,6 @@ import org.junit.runner.RunWith; @RunWith(AndroidJUnit4.class) @androidx.test.filters.SmallTest -@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") public class NetworkUtilsInternalTest { private static void expectSocketSuccess(String msg, int domain, int type) { diff --git a/tests/unit/java/com/android/internal/net/VpnProfileTest.java b/tests/unit/java/com/android/internal/net/VpnProfileTest.java index 64cbc4e13b..cb0f0710d6 100644 --- a/tests/unit/java/com/android/internal/net/VpnProfileTest.java +++ b/tests/unit/java/com/android/internal/net/VpnProfileTest.java @@ -25,9 +25,7 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import android.net.IpSecAlgorithm; -import android.os.Build; -import androidx.test.filters.SdkSuppress; import androidx.test.filters.SmallTest; import org.junit.Test; @@ -41,7 +39,6 @@ import java.util.List; /** Unit tests for {@link VpnProfile}. */ @SmallTest @RunWith(JUnit4.class) -@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") public class VpnProfileTest { private static final String DUMMY_PROFILE_KEY = "Test"; diff --git a/tests/unit/java/com/android/internal/util/BitUtilsTest.java b/tests/unit/java/com/android/internal/util/BitUtilsTest.java index 9c6ac9b807..d2fbdce977 100644 --- a/tests/unit/java/com/android/internal/util/BitUtilsTest.java +++ b/tests/unit/java/com/android/internal/util/BitUtilsTest.java @@ -30,9 +30,6 @@ import static com.android.internal.util.BitUtils.unpackBits; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import android.os.Build; - -import androidx.test.filters.SdkSuppress; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -45,7 +42,6 @@ import java.util.Random; @SmallTest @RunWith(AndroidJUnit4.class) -@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") public class BitUtilsTest { @Test diff --git a/tests/unit/java/com/android/internal/util/RingBufferTest.java b/tests/unit/java/com/android/internal/util/RingBufferTest.java index 81a65135ce..d06095a690 100644 --- a/tests/unit/java/com/android/internal/util/RingBufferTest.java +++ b/tests/unit/java/com/android/internal/util/RingBufferTest.java @@ -20,9 +20,6 @@ import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertNull; import static org.junit.Assert.fail; -import android.os.Build; - -import androidx.test.filters.SdkSuppress; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -31,7 +28,6 @@ import org.junit.runner.RunWith; @SmallTest @RunWith(AndroidJUnit4.class) -@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") public class RingBufferTest { @Test diff --git a/tests/unit/java/com/android/server/ConnectivityServiceTest.java b/tests/unit/java/com/android/server/ConnectivityServiceTest.java index 0e6758355b..6c484cca06 100644 --- a/tests/unit/java/com/android/server/ConnectivityServiceTest.java +++ b/tests/unit/java/com/android/server/ConnectivityServiceTest.java @@ -300,7 +300,6 @@ import android.util.Range; import android.util.SparseArray; import androidx.test.InstrumentationRegistry; -import androidx.test.filters.SdkSuppress; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -391,7 +390,6 @@ import kotlin.reflect.KClass; */ @RunWith(AndroidJUnit4.class) @SmallTest -@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") public class ConnectivityServiceTest { private static final String TAG = "ConnectivityServiceTest"; diff --git a/tests/unit/java/com/android/server/IpSecServiceParameterizedTest.java b/tests/unit/java/com/android/server/IpSecServiceParameterizedTest.java index 2b5bfacf50..cf2c9c783a 100644 --- a/tests/unit/java/com/android/server/IpSecServiceParameterizedTest.java +++ b/tests/unit/java/com/android/server/IpSecServiceParameterizedTest.java @@ -58,13 +58,11 @@ import android.net.LinkAddress; import android.net.LinkProperties; import android.net.Network; import android.os.Binder; -import android.os.Build; import android.os.ParcelFileDescriptor; import android.system.Os; import android.test.mock.MockContext; import android.util.ArraySet; -import androidx.test.filters.SdkSuppress; import androidx.test.filters.SmallTest; import com.android.server.IpSecService.TunnelInterfaceRecord; @@ -84,7 +82,6 @@ import java.util.Set; /** Unit tests for {@link IpSecService}. */ @SmallTest @RunWith(Parameterized.class) -@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") public class IpSecServiceParameterizedTest { private static final int TEST_SPI = 0xD1201D; diff --git a/tests/unit/java/com/android/server/IpSecServiceRefcountedResourceTest.java b/tests/unit/java/com/android/server/IpSecServiceRefcountedResourceTest.java index 0e3b03c97a..22a2c94fc1 100644 --- a/tests/unit/java/com/android/server/IpSecServiceRefcountedResourceTest.java +++ b/tests/unit/java/com/android/server/IpSecServiceRefcountedResourceTest.java @@ -30,11 +30,9 @@ import static org.mockito.Mockito.verify; import android.content.Context; import android.os.Binder; -import android.os.Build; import android.os.IBinder; import android.os.RemoteException; -import androidx.test.filters.SdkSuppress; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -54,7 +52,6 @@ import java.util.concurrent.ThreadLocalRandom; /** Unit tests for {@link IpSecService.RefcountedResource}. */ @SmallTest @RunWith(AndroidJUnit4.class) -@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") public class IpSecServiceRefcountedResourceTest { Context mMockContext; IpSecService.IpSecServiceConfiguration mMockIpSecSrvConfig; diff --git a/tests/unit/java/com/android/server/IpSecServiceTest.java b/tests/unit/java/com/android/server/IpSecServiceTest.java index 2dc21c0634..6232423b4f 100644 --- a/tests/unit/java/com/android/server/IpSecServiceTest.java +++ b/tests/unit/java/com/android/server/IpSecServiceTest.java @@ -43,7 +43,6 @@ import android.net.IpSecManager; import android.net.IpSecSpiResponse; import android.net.IpSecUdpEncapResponse; import android.os.Binder; -import android.os.Build; import android.os.ParcelFileDescriptor; import android.os.Process; import android.system.ErrnoException; @@ -51,7 +50,6 @@ import android.system.Os; import android.system.StructStat; import android.util.Range; -import androidx.test.filters.SdkSuppress; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -73,7 +71,6 @@ import java.util.List; /** Unit tests for {@link IpSecService}. */ @SmallTest @RunWith(AndroidJUnit4.class) -@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") public class IpSecServiceTest { private static final int DROID_SPI = 0xD1201D; diff --git a/tests/unit/java/com/android/server/LegacyTypeTrackerTest.kt b/tests/unit/java/com/android/server/LegacyTypeTrackerTest.kt index 750703cc70..5ec111954f 100644 --- a/tests/unit/java/com/android/server/LegacyTypeTrackerTest.kt +++ b/tests/unit/java/com/android/server/LegacyTypeTrackerTest.kt @@ -43,9 +43,7 @@ import android.net.ConnectivityManager.TYPE_WIMAX import android.net.EthernetManager import android.net.NetworkInfo.DetailedState.CONNECTED import android.net.NetworkInfo.DetailedState.DISCONNECTED -import android.os.Build import android.telephony.TelephonyManager -import androidx.test.filters.SdkSuppress import androidx.test.filters.SmallTest import androidx.test.runner.AndroidJUnit4 import com.android.server.ConnectivityService.LegacyTypeTracker @@ -68,7 +66,6 @@ const val UNSUPPORTED_TYPE = TYPE_WIMAX @RunWith(AndroidJUnit4::class) @SmallTest -@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") class LegacyTypeTrackerTest { private val supportedTypes = arrayOf(TYPE_WIFI, TYPE_WIFI_P2P, TYPE_ETHERNET, TYPE_MOBILE, TYPE_MOBILE_SUPL, TYPE_MOBILE_MMS, TYPE_MOBILE_SUPL, TYPE_MOBILE_DUN, TYPE_MOBILE_HIPRI, diff --git a/tests/unit/java/com/android/server/NetIdManagerTest.kt b/tests/unit/java/com/android/server/NetIdManagerTest.kt index 5c43197696..6f5e740d34 100644 --- a/tests/unit/java/com/android/server/NetIdManagerTest.kt +++ b/tests/unit/java/com/android/server/NetIdManagerTest.kt @@ -16,8 +16,6 @@ package com.android.server -import android.os.Build -import androidx.test.filters.SdkSuppress import androidx.test.filters.SmallTest import androidx.test.runner.AndroidJUnit4 import com.android.server.NetIdManager.MIN_NET_ID @@ -29,7 +27,6 @@ import kotlin.test.assertEquals @RunWith(AndroidJUnit4::class) @SmallTest -@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") class NetIdManagerTest { @Test fun testReserveReleaseNetId() { diff --git a/tests/unit/java/com/android/server/NetworkManagementServiceTest.java b/tests/unit/java/com/android/server/NetworkManagementServiceTest.java index 32a8f3bec7..13516d75a5 100644 --- a/tests/unit/java/com/android/server/NetworkManagementServiceTest.java +++ b/tests/unit/java/com/android/server/NetworkManagementServiceTest.java @@ -38,14 +38,12 @@ import android.net.LinkAddress; import android.net.NetworkPolicyManager; import android.os.BatteryStats; import android.os.Binder; -import android.os.Build; import android.os.IBinder; import android.os.Process; import android.os.RemoteException; import android.test.suitebuilder.annotation.SmallTest; import android.util.ArrayMap; -import androidx.test.filters.SdkSuppress; import androidx.test.runner.AndroidJUnit4; import com.android.internal.app.IBatteryStats; @@ -68,7 +66,6 @@ import java.util.function.BiFunction; */ @RunWith(AndroidJUnit4.class) @SmallTest -@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") public class NetworkManagementServiceTest { private NetworkManagementService mNMService; @Mock private Context mContext; diff --git a/tests/unit/java/com/android/server/NsdServiceTest.java b/tests/unit/java/com/android/server/NsdServiceTest.java index 5ea0e8ea6a..1eac4ea280 100644 --- a/tests/unit/java/com/android/server/NsdServiceTest.java +++ b/tests/unit/java/com/android/server/NsdServiceTest.java @@ -31,13 +31,11 @@ import android.content.ContentResolver; import android.content.Context; import android.net.nsd.NsdManager; import android.net.nsd.NsdServiceInfo; -import android.os.Build; import android.os.Handler; import android.os.HandlerThread; import android.os.Looper; import android.os.Message; -import androidx.test.filters.SdkSuppress; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -60,7 +58,6 @@ import org.mockito.Spy; // - test NSD_ON ENABLE/DISABLED listening @RunWith(AndroidJUnit4.class) @SmallTest -@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") public class NsdServiceTest { static final int PROTOCOL = NsdManager.PROTOCOL_DNS_SD; diff --git a/tests/unit/java/com/android/server/connectivity/DnsManagerTest.java b/tests/unit/java/com/android/server/connectivity/DnsManagerTest.java index 9f0c9d6a4f..0ffeec98cf 100644 --- a/tests/unit/java/com/android/server/connectivity/DnsManagerTest.java +++ b/tests/unit/java/com/android/server/connectivity/DnsManagerTest.java @@ -55,12 +55,10 @@ import android.net.ResolverOptionsParcel; import android.net.ResolverParamsParcel; import android.net.RouteInfo; import android.net.shared.PrivateDnsConfig; -import android.os.Build; import android.provider.Settings; import android.test.mock.MockContentResolver; import android.util.SparseArray; -import androidx.test.filters.SdkSuppress; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -87,7 +85,6 @@ import java.util.Arrays; */ @RunWith(AndroidJUnit4.class) @SmallTest -@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") public class DnsManagerTest { static final String TEST_IFACENAME = "test_wlan0"; static final int TEST_NETID = 100; diff --git a/tests/unit/java/com/android/server/connectivity/FullScoreTest.kt b/tests/unit/java/com/android/server/connectivity/FullScoreTest.kt index 02f3da78de..45b575a436 100644 --- a/tests/unit/java/com/android/server/connectivity/FullScoreTest.kt +++ b/tests/unit/java/com/android/server/connectivity/FullScoreTest.kt @@ -19,10 +19,8 @@ package com.android.server.connectivity import android.net.NetworkAgentConfig import android.net.NetworkCapabilities import android.net.NetworkScore.KEEP_CONNECTED_NONE -import android.os.Build import android.text.TextUtils import android.util.ArraySet -import androidx.test.filters.SdkSuppress import androidx.test.filters.SmallTest import androidx.test.runner.AndroidJUnit4 import com.android.server.connectivity.FullScore.MAX_CS_MANAGED_POLICY @@ -42,7 +40,6 @@ import kotlin.test.assertTrue @RunWith(AndroidJUnit4::class) @SmallTest -@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") class FullScoreTest { // Convenience methods fun FullScore.withPolicies( diff --git a/tests/unit/java/com/android/server/connectivity/IpConnectivityEventBuilderTest.java b/tests/unit/java/com/android/server/connectivity/IpConnectivityEventBuilderTest.java index d6acea1dc2..70495cced5 100644 --- a/tests/unit/java/com/android/server/connectivity/IpConnectivityEventBuilderTest.java +++ b/tests/unit/java/com/android/server/connectivity/IpConnectivityEventBuilderTest.java @@ -42,10 +42,8 @@ import android.net.metrics.NetworkEvent; import android.net.metrics.RaEvent; import android.net.metrics.ValidationProbeEvent; import android.net.metrics.WakeupStats; -import android.os.Build; import android.test.suitebuilder.annotation.SmallTest; -import androidx.test.filters.SdkSuppress; import androidx.test.runner.AndroidJUnit4; import com.android.server.connectivity.metrics.nano.IpConnectivityLogClass.IpConnectivityEvent; @@ -59,7 +57,6 @@ import java.util.List; // TODO: instead of comparing textpb to textpb, parse textpb and compare proto to proto. @RunWith(AndroidJUnit4.class) @SmallTest -@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") public class IpConnectivityEventBuilderTest { @Test diff --git a/tests/unit/java/com/android/server/connectivity/IpConnectivityMetricsTest.java b/tests/unit/java/com/android/server/connectivity/IpConnectivityMetricsTest.java index d0038a4855..8b072c49de 100644 --- a/tests/unit/java/com/android/server/connectivity/IpConnectivityMetricsTest.java +++ b/tests/unit/java/com/android/server/connectivity/IpConnectivityMetricsTest.java @@ -45,13 +45,11 @@ import android.net.metrics.IpManagerEvent; import android.net.metrics.IpReachabilityEvent; import android.net.metrics.RaEvent; import android.net.metrics.ValidationProbeEvent; -import android.os.Build; import android.os.Parcelable; import android.system.OsConstants; import android.test.suitebuilder.annotation.SmallTest; import android.util.Base64; -import androidx.test.filters.SdkSuppress; import androidx.test.runner.AndroidJUnit4; import com.android.internal.util.BitUtils; @@ -69,7 +67,6 @@ import java.io.StringWriter; @RunWith(AndroidJUnit4.class) @SmallTest -@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") public class IpConnectivityMetricsTest { static final IpReachabilityEvent FAKE_EV = new IpReachabilityEvent(IpReachabilityEvent.NUD_FAILED); diff --git a/tests/unit/java/com/android/server/connectivity/LingerMonitorTest.java b/tests/unit/java/com/android/server/connectivity/LingerMonitorTest.java index 3f3bfddd22..36e229d8aa 100644 --- a/tests/unit/java/com/android/server/connectivity/LingerMonitorTest.java +++ b/tests/unit/java/com/android/server/connectivity/LingerMonitorTest.java @@ -43,10 +43,8 @@ import android.net.NetworkInfo; import android.net.NetworkProvider; import android.net.NetworkScore; import android.os.Binder; -import android.os.Build; import android.text.format.DateUtils; -import androidx.test.filters.SdkSuppress; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -63,7 +61,6 @@ import org.mockito.MockitoAnnotations; @RunWith(AndroidJUnit4.class) @SmallTest -@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") public class LingerMonitorTest { static final String CELLULAR = "CELLULAR"; static final String WIFI = "WIFI"; diff --git a/tests/unit/java/com/android/server/connectivity/MultipathPolicyTrackerTest.java b/tests/unit/java/com/android/server/connectivity/MultipathPolicyTrackerTest.java index f8ef31ceb3..4c80f6a21d 100644 --- a/tests/unit/java/com/android/server/connectivity/MultipathPolicyTrackerTest.java +++ b/tests/unit/java/com/android/server/connectivity/MultipathPolicyTrackerTest.java @@ -54,7 +54,6 @@ import android.net.NetworkPolicy; import android.net.NetworkPolicyManager; import android.net.NetworkTemplate; import android.net.TelephonyNetworkSpecifier; -import android.os.Build; import android.os.Handler; import android.os.UserHandle; import android.provider.Settings; @@ -63,7 +62,6 @@ import android.test.mock.MockContentResolver; import android.util.DataUnit; import android.util.RecurrenceRule; -import androidx.test.filters.SdkSuppress; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -91,7 +89,6 @@ import java.time.temporal.ChronoUnit; @RunWith(AndroidJUnit4.class) @SmallTest -@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") public class MultipathPolicyTrackerTest { private static final Network TEST_NETWORK = new Network(123); private static final int POLICY_SNOOZED = -100; diff --git a/tests/unit/java/com/android/server/connectivity/Nat464XlatTest.java b/tests/unit/java/com/android/server/connectivity/Nat464XlatTest.java index 9204d14dbb..9b2a638f8b 100644 --- a/tests/unit/java/com/android/server/connectivity/Nat464XlatTest.java +++ b/tests/unit/java/com/android/server/connectivity/Nat464XlatTest.java @@ -40,11 +40,9 @@ import android.net.LinkProperties; import android.net.NetworkAgentConfig; import android.net.NetworkCapabilities; import android.net.NetworkInfo; -import android.os.Build; import android.os.Handler; import android.os.test.TestLooper; -import androidx.test.filters.SdkSuppress; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -60,7 +58,6 @@ import org.mockito.MockitoAnnotations; @RunWith(AndroidJUnit4.class) @SmallTest -@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") public class Nat464XlatTest { static final String BASE_IFACE = "test0"; diff --git a/tests/unit/java/com/android/server/connectivity/NetdEventListenerServiceTest.java b/tests/unit/java/com/android/server/connectivity/NetdEventListenerServiceTest.java index 8aad1a2564..50aaaee244 100644 --- a/tests/unit/java/com/android/server/connectivity/NetdEventListenerServiceTest.java +++ b/tests/unit/java/com/android/server/connectivity/NetdEventListenerServiceTest.java @@ -31,12 +31,10 @@ import android.content.Context; import android.net.ConnectivityManager; import android.net.Network; import android.net.NetworkCapabilities; -import android.os.Build; import android.system.OsConstants; import android.test.suitebuilder.annotation.SmallTest; import android.util.Base64; -import androidx.test.filters.SdkSuppress; import androidx.test.runner.AndroidJUnit4; import com.android.server.connectivity.metrics.nano.IpConnectivityLogClass.IpConnectivityEvent; @@ -56,7 +54,6 @@ import java.util.List; @RunWith(AndroidJUnit4.class) @SmallTest -@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") public class NetdEventListenerServiceTest { private static final String EXAMPLE_IPV4 = "192.0.2.1"; private static final String EXAMPLE_IPV6 = "2001:db8:1200::2:1"; diff --git a/tests/unit/java/com/android/server/connectivity/NetworkNotificationManagerTest.java b/tests/unit/java/com/android/server/connectivity/NetworkNotificationManagerTest.java index 160068f70c..3adf08c199 100644 --- a/tests/unit/java/com/android/server/connectivity/NetworkNotificationManagerTest.java +++ b/tests/unit/java/com/android/server/connectivity/NetworkNotificationManagerTest.java @@ -39,11 +39,9 @@ import android.content.res.Resources; import android.net.ConnectivityResources; import android.net.NetworkCapabilities; import android.net.NetworkInfo; -import android.os.Build; import android.os.UserHandle; import android.telephony.TelephonyManager; -import androidx.test.filters.SdkSuppress; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -51,7 +49,9 @@ import com.android.connectivity.resources.R; import com.android.server.connectivity.NetworkNotificationManager.NotificationType; import org.junit.After; +import org.junit.AfterClass; import org.junit.Before; +import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; @@ -67,7 +67,6 @@ import java.util.List; @RunWith(AndroidJUnit4.class) @SmallTest -@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") public class NetworkNotificationManagerTest { private static final String TEST_SSID = "Test SSID"; diff --git a/tests/unit/java/com/android/server/connectivity/NetworkOfferTest.kt b/tests/unit/java/com/android/server/connectivity/NetworkOfferTest.kt index d12f1c0b24..409f8c3099 100644 --- a/tests/unit/java/com/android/server/connectivity/NetworkOfferTest.kt +++ b/tests/unit/java/com/android/server/connectivity/NetworkOfferTest.kt @@ -20,8 +20,6 @@ import android.net.INetworkOfferCallback import android.net.NetworkCapabilities import android.net.NetworkRequest import android.net.NetworkScore.KEEP_CONNECTED_NONE -import android.os.Build -import androidx.test.filters.SdkSuppress import androidx.test.filters.SmallTest import androidx.test.runner.AndroidJUnit4 import org.junit.Test @@ -36,7 +34,6 @@ const val POLICY_NONE = 0L @RunWith(AndroidJUnit4::class) @SmallTest -@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") class NetworkOfferTest { val mockCallback = mock(INetworkOfferCallback::class.java) diff --git a/tests/unit/java/com/android/server/connectivity/NetworkRankerTest.kt b/tests/unit/java/com/android/server/connectivity/NetworkRankerTest.kt index c35b60e94e..4408958734 100644 --- a/tests/unit/java/com/android/server/connectivity/NetworkRankerTest.kt +++ b/tests/unit/java/com/android/server/connectivity/NetworkRankerTest.kt @@ -24,11 +24,11 @@ import android.net.NetworkScore.POLICY_EXITING import android.net.NetworkScore.POLICY_TRANSPORT_PRIMARY import android.net.NetworkScore.POLICY_YIELD_TO_BAD_WIFI import android.os.Build -import androidx.test.filters.SdkSuppress import androidx.test.filters.SmallTest -import androidx.test.runner.AndroidJUnit4 import com.android.server.connectivity.FullScore.POLICY_EVER_VALIDATED_NOT_AVOIDED_WHEN_BAD import com.android.server.connectivity.FullScore.POLICY_IS_VALIDATED +import com.android.testutils.DevSdkIgnoreRule +import com.android.testutils.DevSdkIgnoreRunner import org.junit.Test import org.junit.runner.RunWith import kotlin.test.assertEquals @@ -38,8 +38,8 @@ private fun score(vararg policies: Int) = FullScore(0, private fun caps(transport: Int) = NetworkCapabilities.Builder().addTransportType(transport).build() @SmallTest -@RunWith(AndroidJUnit4::class) -@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") +@RunWith(DevSdkIgnoreRunner::class) +@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R) class NetworkRankerTest { private val mRanker = NetworkRanker() diff --git a/tests/unit/java/com/android/server/connectivity/PermissionMonitorTest.java b/tests/unit/java/com/android/server/connectivity/PermissionMonitorTest.java index 9c7d9c005d..6bf6cc5493 100644 --- a/tests/unit/java/com/android/server/connectivity/PermissionMonitorTest.java +++ b/tests/unit/java/com/android/server/connectivity/PermissionMonitorTest.java @@ -79,7 +79,6 @@ import android.util.ArraySet; import android.util.SparseIntArray; import androidx.test.InstrumentationRegistry; -import androidx.test.filters.SdkSuppress; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -101,7 +100,6 @@ import java.util.Set; @RunWith(AndroidJUnit4.class) @SmallTest -@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") public class PermissionMonitorTest { private static final UserHandle MOCK_USER1 = UserHandle.of(0); private static final UserHandle MOCK_USER2 = UserHandle.of(1); diff --git a/tests/unit/java/com/android/server/connectivity/VpnTest.java b/tests/unit/java/com/android/server/connectivity/VpnTest.java index 6971b3ca89..6ff47aea34 100644 --- a/tests/unit/java/com/android/server/connectivity/VpnTest.java +++ b/tests/unit/java/com/android/server/connectivity/VpnTest.java @@ -82,7 +82,6 @@ import android.net.VpnService; import android.net.VpnTransportInfo; import android.net.ipsec.ike.IkeSessionCallback; import android.net.ipsec.ike.exceptions.IkeProtocolException; -import android.os.Build; import android.os.Build.VERSION_CODES; import android.os.Bundle; import android.os.ConditionVariable; @@ -97,7 +96,6 @@ import android.util.ArrayMap; import android.util.ArraySet; import android.util.Range; -import androidx.test.filters.SdkSuppress; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -142,7 +140,6 @@ import java.util.stream.Stream; */ @RunWith(AndroidJUnit4.class) @SmallTest -@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") public class VpnTest { private static final String TAG = "VpnTest"; diff --git a/tests/unit/java/com/android/server/net/NetworkStatsAccessTest.java b/tests/unit/java/com/android/server/net/NetworkStatsAccessTest.java index 84a1a8fadb..8b730af769 100644 --- a/tests/unit/java/com/android/server/net/NetworkStatsAccessTest.java +++ b/tests/unit/java/com/android/server/net/NetworkStatsAccessTest.java @@ -25,10 +25,8 @@ import android.app.AppOpsManager; import android.app.admin.DevicePolicyManagerInternal; import android.content.Context; import android.content.pm.PackageManager; -import android.os.Build; import android.telephony.TelephonyManager; -import androidx.test.filters.SdkSuppress; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -43,7 +41,6 @@ import org.mockito.MockitoAnnotations; @RunWith(AndroidJUnit4.class) @SmallTest -@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") public class NetworkStatsAccessTest { private static final String TEST_PKG = "com.example.test"; private static final int TEST_UID = 12345; diff --git a/tests/unit/java/com/android/server/net/NetworkStatsCollectionTest.java b/tests/unit/java/com/android/server/net/NetworkStatsCollectionTest.java index 57f48f508c..505ff9b6a3 100644 --- a/tests/unit/java/com/android/server/net/NetworkStatsCollectionTest.java +++ b/tests/unit/java/com/android/server/net/NetworkStatsCollectionTest.java @@ -42,7 +42,6 @@ import android.net.NetworkIdentity; import android.net.NetworkStats; import android.net.NetworkStatsHistory; import android.net.NetworkTemplate; -import android.os.Build; import android.os.Process; import android.os.UserHandle; import android.telephony.SubscriptionPlan; @@ -51,7 +50,6 @@ import android.text.format.DateUtils; import android.util.RecurrenceRule; import androidx.test.InstrumentationRegistry; -import androidx.test.filters.SdkSuppress; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -83,7 +81,6 @@ import java.util.List; */ @RunWith(AndroidJUnit4.class) @SmallTest -@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") public class NetworkStatsCollectionTest { private static final String TEST_FILE = "test.bin"; diff --git a/tests/unit/java/com/android/server/net/NetworkStatsFactoryTest.java b/tests/unit/java/com/android/server/net/NetworkStatsFactoryTest.java index 4c80678b71..40d44468a6 100644 --- a/tests/unit/java/com/android/server/net/NetworkStatsFactoryTest.java +++ b/tests/unit/java/com/android/server/net/NetworkStatsFactoryTest.java @@ -37,10 +37,8 @@ import android.content.res.Resources; import android.net.NetworkStats; import android.net.TrafficStats; import android.net.UnderlyingNetworkInfo; -import android.os.Build; import androidx.test.InstrumentationRegistry; -import androidx.test.filters.SdkSuppress; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -64,7 +62,6 @@ import java.io.OutputStream; /** Tests for {@link NetworkStatsFactory}. */ @RunWith(AndroidJUnit4.class) @SmallTest -@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") public class NetworkStatsFactoryTest extends NetworkStatsBaseTest { private static final String CLAT_PREFIX = "v4-"; diff --git a/tests/unit/java/com/android/server/net/NetworkStatsObserversTest.java b/tests/unit/java/com/android/server/net/NetworkStatsObserversTest.java index 7e8081b6d6..9fa1c50423 100644 --- a/tests/unit/java/com/android/server/net/NetworkStatsObserversTest.java +++ b/tests/unit/java/com/android/server/net/NetworkStatsObserversTest.java @@ -39,7 +39,6 @@ import android.net.DataUsageRequest; import android.net.NetworkIdentity; import android.net.NetworkStats; import android.net.NetworkTemplate; -import android.os.Build; import android.os.ConditionVariable; import android.os.Handler; import android.os.HandlerThread; @@ -51,7 +50,6 @@ import android.os.UserHandle; import android.telephony.TelephonyManager; import android.util.ArrayMap; -import androidx.test.filters.SdkSuppress; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -72,7 +70,6 @@ import java.util.Objects; */ @RunWith(AndroidJUnit4.class) @SmallTest -@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") public class NetworkStatsObserversTest { private static final String TEST_IFACE = "test0"; private static final String TEST_IFACE2 = "test1"; diff --git a/tests/unit/java/com/android/server/net/NetworkStatsServiceTest.java b/tests/unit/java/com/android/server/net/NetworkStatsServiceTest.java index 9b2c278ecf..ee94ae9301 100644 --- a/tests/unit/java/com/android/server/net/NetworkStatsServiceTest.java +++ b/tests/unit/java/com/android/server/net/NetworkStatsServiceTest.java @@ -98,7 +98,6 @@ import android.net.NetworkTemplate; import android.net.TelephonyNetworkSpecifier; import android.net.UnderlyingNetworkInfo; import android.net.netstats.provider.INetworkStatsProviderCallback; -import android.os.Build; import android.os.ConditionVariable; import android.os.Handler; import android.os.HandlerThread; @@ -114,7 +113,6 @@ import android.telephony.TelephonyManager; import androidx.annotation.Nullable; import androidx.test.InstrumentationRegistry; -import androidx.test.filters.SdkSuppress; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -150,7 +148,6 @@ import java.util.concurrent.Executor; */ @RunWith(AndroidJUnit4.class) @SmallTest -@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") public class NetworkStatsServiceTest extends NetworkStatsBaseTest { private static final String TAG = "NetworkStatsServiceTest"; diff --git a/tests/unit/java/com/android/server/net/NetworkStatsSubscriptionsMonitorTest.java b/tests/unit/java/com/android/server/net/NetworkStatsSubscriptionsMonitorTest.java index f30a9c5e1a..6d2c7dc39f 100644 --- a/tests/unit/java/com/android/server/net/NetworkStatsSubscriptionsMonitorTest.java +++ b/tests/unit/java/com/android/server/net/NetworkStatsSubscriptionsMonitorTest.java @@ -34,7 +34,6 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.content.Context; import android.net.NetworkTemplate; -import android.os.Build; import android.os.test.TestLooper; import android.telephony.NetworkRegistrationInfo; import android.telephony.PhoneStateListener; @@ -42,8 +41,6 @@ import android.telephony.ServiceState; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; -import androidx.test.filters.SdkSuppress; - import com.android.internal.util.CollectionUtils; import com.android.server.net.NetworkStatsSubscriptionsMonitor.RatTypeListener; @@ -61,7 +58,6 @@ import java.util.concurrent.Executor; import java.util.concurrent.Executors; @RunWith(JUnit4.class) -@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") public final class NetworkStatsSubscriptionsMonitorTest { private static final int TEST_SUBID1 = 3; private static final int TEST_SUBID2 = 5; diff --git a/tests/unit/java/com/android/server/net/ipmemorystore/NetworkAttributesTest.java b/tests/unit/java/com/android/server/net/ipmemorystore/NetworkAttributesTest.java index 406fdd856b..ebbc0ef625 100644 --- a/tests/unit/java/com/android/server/net/ipmemorystore/NetworkAttributesTest.java +++ b/tests/unit/java/com/android/server/net/ipmemorystore/NetworkAttributesTest.java @@ -20,9 +20,7 @@ import static org.junit.Assert.assertEquals; import android.net.ipmemorystore.NetworkAttributes; import android.net.networkstack.aidl.quirks.IPv6ProvisioningLossQuirk; -import android.os.Build; -import androidx.test.filters.SdkSuppress; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -37,7 +35,6 @@ import java.util.Arrays; /** Unit tests for {@link NetworkAttributes}. */ @SmallTest @RunWith(AndroidJUnit4.class) -@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S") public class NetworkAttributesTest { private static final String WEIGHT_FIELD_NAME_PREFIX = "WEIGHT_"; private static final float EPSILON = 0.0001f;