Fix testDataMigrationUtils fail on R device
Since the test is using JUnit3, which doesn't support rules
or assumeTrue, the IgnoreUpTo rule does not take effect.
Replace with a return statement as short term solution to
unblock presumit.
Test: atest CtsNetTestCasesLatestSdk:android.net.cts.NetworkStatsManagerTest
on R device
Bug: 219099881
Fix: 223974348
Ignore-AOSP-First: Required API is not in AOSP yet
Merged-In: I6056da19324715237c6fdac0975fb89de8a04416
Change-Id: I6056da19324715237c6fdac0975fb89de8a04416
(cherry picked from commit 40c7e1d460b4c34a93f8b8e00e71d45c36ab85ab)
diff --git a/tests/cts/net/src/android/net/cts/NetworkStatsManagerTest.java b/tests/cts/net/src/android/net/cts/NetworkStatsManagerTest.java
index de4f41b..eba7a76 100644
--- a/tests/cts/net/src/android/net/cts/NetworkStatsManagerTest.java
+++ b/tests/cts/net/src/android/net/cts/NetworkStatsManagerTest.java
@@ -33,8 +33,6 @@
import static android.net.netstats.NetworkStatsDataMigrationUtils.PREFIX_UID_TAG;
import static android.net.netstats.NetworkStatsDataMigrationUtils.PREFIX_XT;
-import static com.android.testutils.DevSdkIgnoreRuleKt.SC_V2;
-
import android.app.AppOpsManager;
import android.app.usage.NetworkStats;
import android.app.usage.NetworkStatsManager;
@@ -63,7 +61,6 @@
import com.android.compatibility.common.util.ShellIdentityUtils;
import com.android.compatibility.common.util.SystemUtil;
import com.android.modules.utils.build.SdkLevel;
-import com.android.testutils.DevSdkIgnoreRule;
import java.io.IOException;
import java.io.InputStream;
@@ -852,8 +849,9 @@
}
@AppModeFull
- @DevSdkIgnoreRule.IgnoreUpTo(SC_V2)
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)