LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Fix testDataMigrationUtils fail on R device"

Browse Source 
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 4bbe2b0825)
Change-Id: Ib331656a7fe16d4f2aa62c1925f37296785042a3
This commit is contained in:
Junyu Lai
2022-05-13 10:09:36 +00:00
parent 6131964382
commit 3b598cb092
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/cts/net/src/android/net/cts/NetworkStatsManagerTest.java
View File

@@ -871,10 +871,9 @@ public class NetworkStatsManagerTest {
} }
} }
@DevSdkIgnoreRule.IgnoreUpTo(SC_V2)
@Test @Test
public void testDataMigrationUtils() throws Exception { public void testDataMigrationUtils() throws Exception {
if (!SdkLevel.isAtLeastT()) return;
final List<String> prefixes = List.of(PREFIX_UID, PREFIX_XT, PREFIX_UID_TAG); final List<String> prefixes = List.of(PREFIX_UID, PREFIX_XT, PREFIX_UID_TAG);
for (final String prefix : prefixes) { for (final String prefix : prefixes) {
final long duration = TextUtils.equals(PREFIX_XT, prefix) ? TimeUnit.HOURS.toMillis(1) final long duration = TextUtils.equals(PREFIX_XT, prefix) ? TimeUnit.HOURS.toMillis(1)