Merge "Revert "Fix testDataMigrationUtils fail on R device"" into stage-aosp-master
This commit is contained in:
committed by
Android (Google) Code Review
commit
c6fc9233fc
@@ -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)
|
||||||
|
|||||||
Reference in New Issue
Block a user