commit 97e60b31597fcaecc6c3850ab87ce154e1152593
author junyulai <junyulai@google.com> Thu May 12 15:30:48 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu May 12 15:30:48 2022 +0000
tree 825c75af6c5f7c54fa8c67f1a09525b95da4aff3
parent aed3278787cabcd0b472d4df3d02f9b131c854b7
parent cb9ad3af0e85e18bac10b48216854741ab726b41

Fix testDataMigrationUtils fail on R device am: cb9ad3af0e

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

Change-Id: I94a53e6607cd03704580c685fb7c7784989a8ccc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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)