commit 93e7de263b5d30790a00ea6b85e7d94d7f27526b
author Aaron Huang <huangaaron@google.com> Tue Mar 22 13:24:14 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Mar 22 13:24:14 2022 +0000
tree 5b22e13e134ca3514712f420b615056f64b10285
parent e6c3e06cae3605b517c246302b8f34f485dcbbe4
parent b793c4cc469bcadfd7cf53b47d087a64c2932cb2

[automerger skipped] Merge "Fix proto invalid write type" am: a036ac4569 am: 18fe57024e am: 04eb319ab6 -s ours am: b793c4cc46 -s ours

am skip reason: Merged-In I09cae385050e569b1da98ad7de0e226b13ee6895 with SHA-1 5d977f4b84 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2005290

Change-Id: I8b300591ff7acc1c63f4efea09a18d2fc7042b82

tests/cts/net/src/android/net/cts/NetworkStatsManagerTest.java

diff --git a/tests/cts/net/src/android/net/cts/NetworkStatsManagerTest.java b/tests/cts/net/src/android/net/cts/NetworkStatsManagerTest.java
index de4f41b..eba7a76 100644
--- a/tests/cts/net/src/android/net/cts/NetworkStatsManagerTest.java
+++ b/tests/cts/net/src/android/net/cts/NetworkStatsManagerTest.java
@@ -33,8 +33,6 @@
 import static android.net.netstats.NetworkStatsDataMigrationUtils.PREFIX_UID_TAG;
 import static android.net.netstats.NetworkStatsDataMigrationUtils.PREFIX_XT;
 
-import static com.android.testutils.DevSdkIgnoreRuleKt.SC_V2;
-
 import android.app.AppOpsManager;
 import android.app.usage.NetworkStats;
 import android.app.usage.NetworkStatsManager;
@@ -63,7 +61,6 @@
 import com.android.compatibility.common.util.ShellIdentityUtils;
 import com.android.compatibility.common.util.SystemUtil;
 import com.android.modules.utils.build.SdkLevel;
-import com.android.testutils.DevSdkIgnoreRule;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -852,8 +849,9 @@
     }
 
     @AppModeFull
-    @DevSdkIgnoreRule.IgnoreUpTo(SC_V2)
     public void testDataMigrationUtils() throws Exception {
+        if (!SdkLevel.isAtLeastT()) return;
+
         final List<String> prefixes = List.of(PREFIX_UID, PREFIX_XT, PREFIX_UID_TAG);
         for (final String prefix : prefixes) {
             final long duration = TextUtils.equals(PREFIX_XT, prefix) ? TimeUnit.HOURS.toMillis(1)