commit 3d153f9a89cf01f58f0d35602bc6d311c65613b8
author Motomu Utsumi <motomuman@google.com> Wed Jun 21 04:06:33 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jun 21 04:06:33 2023 +0000
tree 2081c98754210b1b80022f34746a6f1c285c64b4
parent 76f61bb2e887b2913b2004fc20773ba3a76eb05c
parent 5750451d4bf1a49a9597b842228e50faed5c778f

Merge "Skip testDefaultNetworkActiveListener on R devices."

tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java

diff --git a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
index 03e74e0..c646ac4 100644
--- a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
+++ b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
@@ -3152,7 +3152,8 @@
     }
 
     @AppModeFull(reason = "Need WiFi support to test the default active network")
-    @Test
+    // NetworkActivityTracker is not mainlined before S.
+    @Test @DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R)
     public void testDefaultNetworkActiveListener() throws Exception {
         final boolean supportWifi = mPackageManager.hasSystemFeature(FEATURE_WIFI);
         final boolean supportTelephony = mPackageManager.hasSystemFeature(FEATURE_TELEPHONY);