commit 4bbe2b08251e77cd1c1fc26f000f4d2cb5d33aaf
author Junyu Lai <junyulai@google.com> Fri May 13 10:09:36 2022 +0000
committer Junyu Lai <junyulai@google.com> Fri May 13 18:18:15 2022 +0800
tree 2c69099bf6607bca993daa427ee7c1ebf25f140a
parent fc938cf026bce0217aa5d1c7cc4db8337e6ee45a

Revert "Fix testDataMigrationUtils fail on R device"

This reverts commit cb9ad3af0e85e18bac10b48216854741ab726b41.

Reason for revert: Now the test uses JUnit4

Change-Id: Ieb67885033e0832a21ca20f0367db05f6bfa1dab

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 d618915..7c47a70 100644
--- a/tests/cts/net/src/android/net/cts/NetworkStatsManagerTest.java
+++ b/tests/cts/net/src/android/net/cts/NetworkStatsManagerTest.java
@@ -870,10 +870,9 @@
         }
     }
 
+    @DevSdkIgnoreRule.IgnoreUpTo(SC_V2)
     @Test
     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)