commit 10a76f0207556c1476306dd5b3c90da85bc714e1
author Patrick Rohr <prohr@google.com> Tue Mar 22 11:09:36 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Mar 22 11:09:36 2022 +0000
tree 5b22e13e134ca3514712f420b615056f64b10285
parent 3f934a67b7bf304214daac34b9268b1722ff2dd1
parent cb8286d089cb61f5021350911130414010c629e8

[automerger skipped] Merge "Revert^2 "Change Ethernet API to use OutcomeReceiver"" am: a68fba1659 -s ours am: 213c381c35 -s ours am: 5f1377d3d6 -s ours am: b442b7087a -s ours am: cb8286d089 -s ours

am skip reason: Merged-In I4c204a8489c0be006c00581d833f2bb46ae0e71d with SHA-1 ea7e6d56f4 is already in history

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

Change-Id: I6cc7df36b17e88e7b44e53457e34eefc1f751bb8

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)