From e3b067f52363d43476544c9314e3c247b74993e6 Mon Sep 17 00:00:00 2001 From: Patrick Rohr Date: Thu, 17 Feb 2022 21:36:48 +0100 Subject: [PATCH] Skip NetworkStatsServiceTest before T NetworkStatsService was mainlined in T, so the test does not need to be run on previous Android versions. Test: atest CtsNetTestCases:NetworkStatsServiceTest Change-Id: I8e69746a03ef029b1121cc8fa71e299ac12c2905 --- .../java/com/android/server/net/NetworkStatsServiceTest.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/unit/java/com/android/server/net/NetworkStatsServiceTest.java b/tests/unit/java/com/android/server/net/NetworkStatsServiceTest.java index 34bcf3f0fe..16d71d6c34 100644 --- a/tests/unit/java/com/android/server/net/NetworkStatsServiceTest.java +++ b/tests/unit/java/com/android/server/net/NetworkStatsServiceTest.java @@ -63,6 +63,7 @@ import static android.text.format.DateUtils.WEEK_IN_MILLIS; import static com.android.net.module.util.NetworkStatsUtils.SUBSCRIBER_ID_MATCH_RULE_EXACT; import static com.android.server.net.NetworkStatsService.ACTION_NETWORK_STATS_POLL; +import static com.android.testutils.DevSdkIgnoreRuleKt.SC_V2; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -101,7 +102,6 @@ import android.net.TetheringManager; import android.net.UnderlyingNetworkInfo; import android.net.netstats.provider.INetworkStatsProviderCallback; import android.net.wifi.WifiInfo; -import android.os.Build; import android.os.Handler; import android.os.HandlerThread; import android.os.IBinder; @@ -152,7 +152,8 @@ import java.util.concurrent.Executor; */ @RunWith(DevSdkIgnoreRunner.class) @SmallTest -@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R) +// NetworkStatsService is not updatable before T, so tests do not need to be backwards compatible +@DevSdkIgnoreRule.IgnoreUpTo(SC_V2) public class NetworkStatsServiceTest extends NetworkStatsBaseTest { private static final String TAG = "NetworkStatsServiceTest";