| commit | 1ff2b0b7e2e76da7c444e4bde58a1368c82a8473 | [log] [tgz] |
|---|---|---|
| author | Junyu Lai <junyulai@google.com> | Fri May 13 16:39:38 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri May 13 16:39:38 2022 +0000 |
| tree | bc44ed353c8e8b333b783cb2245cbab5c170efb5 | |
| parent | 26acc088a5a233789a0d5408bc54a60e12074f69 [diff] | |
| parent | 4bbe2b08251e77cd1c1fc26f000f4d2cb5d33aaf [diff] |
Revert "Fix testDataMigrationUtils fail on R device" am: 4bbe2b0825 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2098193 Change-Id: I86b56dccae41b655c9c055b94e350c67847a59da Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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)