commit | b089a0862460f533d44f0b00b24bc71afe53396a | [log] [tgz] |
---|---|---|
author | Lorenzo Colitti <lorenzo@google.com> | Fri Feb 18 18:11:05 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Feb 18 18:11:05 2022 +0000 |
tree | 0bbb820c98f15398847cc474277d6b666566b042 | |
parent | a68418f431fd4a111964c5c9260dfdbae6b565b4 [diff] | |
parent | bde2c2c13d713155277bee3b2a2e818e5e7acb9d [diff] |
Merge "Don't check validation state in waitForAvailable(..., Network)." am: dbb9280abc am: 7057f583d3 am: bde2c2c13d Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1989910 Change-Id: Id10b81f0cccf095ad14198f92db3e6c3449c7e6c
diff --git a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java index ac520d1..8f6ff19 100644 --- a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java +++ b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
@@ -2174,7 +2174,7 @@ private void waitForAvailable( @NonNull final TestableNetworkCallback cb, @NonNull final Network expectedNetwork) { cb.expectAvailableCallbacks(expectedNetwork, false /* suspended */, - true /* validated */, + null /* validated */, false /* blocked */, NETWORK_CALLBACK_TIMEOUT_MS); }