| commit | a56ea8445c1e114106ece32edc451df39854686f | [log] [tgz] |
|---|---|---|
| author | Chalard Jean <jchalard@google.com> | Tue Nov 24 09:51:51 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Nov 24 09:51:51 2020 +0000 |
| tree | 166b07f84d240187ddb4bd19542b9e28bcf7b186 | |
| parent | 38cda37e4452b6b34eeb670afc3a0fd1a479c6a7 [diff] | |
| parent | d639d12161e97bc9616ffbefacfc249fe7cb076d [diff] |
Merge "This bug was fixed in S, don't test for it in R" am: d639d12161 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1505171 Change-Id: I80515e22a2434f5deb6001d77c7cad79d9f92615
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)