LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Allow of expectAvailableCallbacks when validation state is unknown."

Browse Source
This commit is contained in:
Lorenzo Colitti
2022-02-18 17:04:27 +00:00
committed by Gerrit Code Review
parent 66c443a64c 5fec18b980
commit 0a0877006d
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
staticlibs/testutils/devicetests/com/android/testutils/TestableNetworkCallback.kt
View File

@@ -287,7 +287,7 @@ open class TestableNetworkCallback private constructor(
fun expectAvailableCallbacks( fun expectAvailableCallbacks(
net: Network, net: Network,
suspended: Boolean = false, suspended: Boolean = false,
validated: Boolean = true, validated: Boolean? = true,
blocked: Boolean = false, blocked: Boolean = false,
tmt: Long = defaultTimeoutMs tmt: Long = defaultTimeoutMs
) { ) {
@@ -309,14 +309,18 @@ open class TestableNetworkCallback private constructor(
private fun expectAvailableCallbacksCommon( private fun expectAvailableCallbacksCommon(
net: Network, net: Network,
suspended: Boolean, suspended: Boolean,
validated: Boolean, validated: Boolean?,
tmt: Long tmt: Long
) { ) {
expectCallback<Available>(net, tmt) expectCallback<Available>(net, tmt)
if (suspended) { if (suspended) {
expectCallback<Suspended>(net, tmt) expectCallback<Suspended>(net, tmt)
} }
expectCapabilitiesThat(net, tmt) { validated == it.hasCapability(NET_CAPABILITY_VALIDATED) } expectCapabilitiesThat(net, tmt) {
validated == null || validated == it.hasCapability(
NET_CAPABILITY_VALIDATED
)
}
expectCallback<LinkPropertiesChanged>(net, tmt) expectCallback<LinkPropertiesChanged>(net, tmt)
} }