| commit | 0d8fcac26400ff26016a52021b0a9bf3bef03222 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Jun 10 15:33:30 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jun 10 15:33:30 2020 +0000 |
| tree | 1ab9a8e56ed75fb8c44f53dccc633ed0feb2b4da | |
| parent | d5d85c20d9768a37c24177639b1e4ad7e0483d23 [diff] | |
| parent | c63627c23cafa1cd8df1ad4ebeb8e998014d8b05 [diff] |
Merge "Enlarge the onAvailable callback timeout to 30 seconds" into rvc-dev am: c63627c23c Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11761870 Change-Id: I00b7ac6441b077a6a7905a0f05aa29efee6e1302
diff --git a/tests/cts/hostside/app/src/com/android/cts/net/hostside/NetworkCallbackTest.java b/tests/cts/hostside/app/src/com/android/cts/net/hostside/NetworkCallbackTest.java index f3cd8a9..aa59959 100644 --- a/tests/cts/hostside/app/src/com/android/cts/net/hostside/NetworkCallbackTest.java +++ b/tests/cts/hostside/app/src/com/android/cts/net/hostside/NetworkCallbackTest.java
@@ -83,6 +83,7 @@ } private class TestNetworkCallback extends INetworkCallback.Stub { + private static final int TEST_CONNECT_TIMEOUT_MS = 30_000; private static final int TEST_CALLBACK_TIMEOUT_MS = 5_000; private final LinkedBlockingQueue<CallbackInfo> mCallbacks = new LinkedBlockingQueue<>(); @@ -131,7 +132,7 @@ } public Network expectAvailableCallbackAndGetNetwork() { - final CallbackInfo cb = nextCallback(TEST_CALLBACK_TIMEOUT_MS); + final CallbackInfo cb = nextCallback(TEST_CONNECT_TIMEOUT_MS); if (cb.state != CallbackState.AVAILABLE) { fail("Network is not available. Instead obtained the following callback :" + cb);