Merge "Fix a bug where any() returns null" am: 3a1932cd79 am: dea6a318db

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1640139

Change-Id: I07d5c7f5e2a49cf7229176abc398f4f138351920
This commit is contained in:
Chalard Jean
2021-03-18 11:14:37 +00:00
committed by Automerger Merge Worker

View File

@@ -44,6 +44,7 @@ import android.net.NetworkCapabilities.TRANSPORT_VPN
import android.net.NetworkInfo import android.net.NetworkInfo
import android.net.NetworkProvider import android.net.NetworkProvider
import android.net.NetworkRequest import android.net.NetworkRequest
import android.net.NetworkScore
import android.net.RouteInfo import android.net.RouteInfo
import android.net.SocketKeepalive import android.net.SocketKeepalive
import android.net.Uri import android.net.Uri
@@ -631,7 +632,7 @@ class NetworkAgentTest {
argThat<NetworkInfo> { it.detailedState == NetworkInfo.DetailedState.CONNECTING }, argThat<NetworkInfo> { it.detailedState == NetworkInfo.DetailedState.CONNECTING },
any(LinkProperties::class.java), any(LinkProperties::class.java),
any(NetworkCapabilities::class.java), any(NetworkCapabilities::class.java),
any() /* score */, any(NetworkScore::class.java),
any(NetworkAgentConfig::class.java), any(NetworkAgentConfig::class.java),
eq(NetworkProvider.ID_NONE)) eq(NetworkProvider.ID_NONE))
} }