commit 3a1932cd797874889bcae2a6086b800cd559eb78
author Chalard Jean <jchalard@google.com> Thu Mar 18 09:59:21 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Mar 18 09:59:21 2021 +0000
tree ff23d8b74c3682089614d42b2cd1e072f30228bd
parent 584cfc6b67a046a9a7ffc43045752bfd70538b21
parent 1705798d13004bcdd5d0860e110f9633bc5d094d

Merge "Fix a bug where any() returns null"

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 f17e50c..bd1139d 100644
--- a/tests/cts/net/src/android/net/cts/NetworkAgentTest.kt
+++ b/tests/cts/net/src/android/net/cts/NetworkAgentTest.kt
@@ -44,6 +44,7 @@
 import android.net.NetworkInfo
 import android.net.NetworkProvider
 import android.net.NetworkRequest
+import android.net.NetworkScore
 import android.net.RouteInfo
 import android.net.SocketKeepalive
 import android.net.Uri
@@ -631,7 +632,7 @@
                 argThat<NetworkInfo> { it.detailedState == NetworkInfo.DetailedState.CONNECTING },
                 any(LinkProperties::class.java),
                 any(NetworkCapabilities::class.java),
-                any() /* score */,
+                any(NetworkScore::class.java),
                 any(NetworkAgentConfig::class.java),
                 eq(NetworkProvider.ID_NONE))
     }