| commit | d08a7785da67751c48c9cdee3b8181dca87ab3cd | [log] [tgz] |
|---|---|---|
| author | Chiachang Wang <chiachangwang@google.com> | Wed Oct 12 04:37:14 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Oct 12 04:37:14 2022 +0000 |
| tree | 765676154071f447aae5c003de7fd6cbe38fd503 | |
| parent | 0debda22bf0a71fc76762361c6725c86e3ad0260 [diff] | |
| parent | 49d3626346ef534c60805724a99634a01d010489 [diff] |
Merge "Increase timeout for waiting a validated network" am: 49d3626346 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2238118 Change-Id: I6c5fc6940995b078c69f90d460dddb4badcf7845 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java index 310d7bf..4887a78 100644 --- a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java +++ b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
@@ -270,7 +270,10 @@ private static final int MIN_KEEPALIVE_INTERVAL = 10; private static final int NETWORK_CALLBACK_TIMEOUT_MS = 30_000; - private static final int LISTEN_ACTIVITY_TIMEOUT_MS = 5_000; + // Timeout for waiting network to be validated. Set the timeout to 30s, which is more than + // DNS timeout. + // TODO(b/252972908): reset the original timer when aosp/2188755 is ramped up. + private static final int LISTEN_ACTIVITY_TIMEOUT_MS = 30_000; private static final int NO_CALLBACK_TIMEOUT_MS = 100; private static final int SOCKET_TIMEOUT_MS = 100; private static final int NUM_TRIES_MULTIPATH_PREF_CHECK = 20;