commit bb99f69ec6c937973c54d6cd8229022b7f7a080b
author Maciej Żenczykowski <maze@google.com> Sun Feb 20 03:49:54 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sun Feb 20 03:49:54 2022 +0000
tree 37b2c380ff107a6330dc83760b8bb467b92e8993
parent 0a7883f99489ed58d43f60e6a1c7a7f476c34cfa
parent 74112b549d69e961ce49a630e07d9c55f0322828

Merge "remove unused import from BpfMap"

staticlibs/testutils/devicetests/com/android/testutils/TestableNetworkCallback.kt

diff --git a/staticlibs/testutils/devicetests/com/android/testutils/TestableNetworkCallback.kt b/staticlibs/testutils/devicetests/com/android/testutils/TestableNetworkCallback.kt
index c2b5a5c..acbb227 100644
--- a/staticlibs/testutils/devicetests/com/android/testutils/TestableNetworkCallback.kt
+++ b/staticlibs/testutils/devicetests/com/android/testutils/TestableNetworkCallback.kt
@@ -287,7 +287,7 @@
     fun expectAvailableCallbacks(
         net: Network,
         suspended: Boolean = false,
-        validated: Boolean = true,
+        validated: Boolean? = true,
         blocked: Boolean = false,
         tmt: Long = defaultTimeoutMs
     ) {
@@ -309,14 +309,18 @@
     private fun expectAvailableCallbacksCommon(
         net: Network,
         suspended: Boolean,
-        validated: Boolean,
+        validated: Boolean?,
         tmt: Long
     ) {
         expectCallback<Available>(net, tmt)
         if (suspended) {
             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)
     }