commit d639d12161e97bc9616ffbefacfc249fe7cb076d
author Chalard Jean <jchalard@google.com> Tue Nov 24 07:01:57 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Nov 24 07:01:57 2020 +0000
tree 166b07f84d240187ddb4bd19542b9e28bcf7b186
parent b9e51da2e8df59c34e0a92b949f9421bf07d8837
parent e90c48c9aadc62a746748918ed6dad179be869a6

Merge "This bug was fixed in S, don't test for it in R"

tests/cts/net/src/android/net/cts/NetworkAgentTest.kt

diff --git a/tests/cts/net/src/android/net/cts/NetworkAgentTest.kt b/tests/cts/net/src/android/net/cts/NetworkAgentTest.kt
index 7508228..45a84f8 100644
--- a/tests/cts/net/src/android/net/cts/NetworkAgentTest.kt
+++ b/tests/cts/net/src/android/net/cts/NetworkAgentTest.kt
@@ -62,6 +62,7 @@
 import com.android.internal.util.AsyncChannel
 import com.android.net.module.util.ArrayTrackRecord
 import com.android.testutils.DevSdkIgnoreRule
+import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo
 import com.android.testutils.RecorderCallback.CallbackEntry.Available
 import com.android.testutils.RecorderCallback.CallbackEntry.Lost
 import com.android.testutils.TestableNetworkCallback
@@ -541,6 +542,7 @@
     }
 
     @Test
+    @IgnoreUpTo(android.os.Build.VERSION_CODES.R)
     fun testAgentStartsInConnecting() {
         val mockContext = mock(Context::class.java)
         val mockCm = mock(ConnectivityManager::class.java)