From b3f83bb55ad63c63d980ea57b4a8ad2b339bbbfb Mon Sep 17 00:00:00 2001 From: Junyu Lai Date: Fri, 13 May 2022 10:09:36 +0000 Subject: [PATCH] Revert "Fix testDataMigrationUtils fail on R device" Follow-up from aosp/2098193, the automerger did not merge the solution into tm-dev downstreams because it mistakenly refer to the Merged-In tag of aosp/2016001. Hence, for tm-dev downstreams, in order to sync up solution to internal branches. This solution need to be manually uploaded with a new Change-Id in order to get merged into its downstreams. Reason for revert: Now the test uses JUnit4 Ignore-AOSP-First: Aosp already has this solution. (cherry picked from commit 4bbe2b08251e77cd1c1fc26f000f4d2cb5d33aaf) Change-Id: Ib331656a7fe16d4f2aa62c1925f37296785042a3 Merged-In: Ib331656a7fe16d4f2aa62c1925f37296785042a3 --- tests/cts/net/src/android/net/cts/NetworkStatsManagerTest.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/cts/net/src/android/net/cts/NetworkStatsManagerTest.java b/tests/cts/net/src/android/net/cts/NetworkStatsManagerTest.java index 5ba6d69eeb..f86c5cd3b4 100644 --- a/tests/cts/net/src/android/net/cts/NetworkStatsManagerTest.java +++ b/tests/cts/net/src/android/net/cts/NetworkStatsManagerTest.java @@ -871,10 +871,9 @@ public class NetworkStatsManagerTest { } } + @DevSdkIgnoreRule.IgnoreUpTo(SC_V2) @Test public void testDataMigrationUtils() throws Exception { - if (!SdkLevel.isAtLeastT()) return; - final List 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)