| commit | 32b9e0f9acde156f4b1b6845a331fb37281ef015 | [log] [tgz] |
|---|---|---|
| author | Motomu Utsumi <motomuman@google.com> | Tue Jul 30 06:57:46 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jul 30 06:57:46 2024 +0000 |
| tree | 0949d258de5387e121d9f251894bdcd0128d949c | |
| parent | cea773adbd1bfb581296f9680d5e17e452a5a479 [diff] | |
| parent | 3ddd83cc1911500259acaa1ed516ceb227c57311 [diff] |
Merge "Increase timeout to expect CapabilitiesChanged callback" into main am: 889ca30e38 am: 3ddd83cc19 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3198173 Change-Id: I57d4b53dc02dd0ff839bf1fe92459a93ab078c1a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/staticlibs/testutils/devicetests/com/android/testutils/DefaultNetworkRestoreMonitor.kt b/staticlibs/testutils/devicetests/com/android/testutils/DefaultNetworkRestoreMonitor.kt index 4a594e6..dd52d0b 100644 --- a/staticlibs/testutils/devicetests/com/android/testutils/DefaultNetworkRestoreMonitor.kt +++ b/staticlibs/testutils/devicetests/com/android/testutils/DefaultNetworkRestoreMonitor.kt
@@ -88,7 +88,7 @@ } cm.registerDefaultNetworkCallback(cb) try { - val cap = capFuture.get(100, TimeUnit.MILLISECONDS) + val cap = capFuture.get(10_000, TimeUnit.MILLISECONDS) initialTransports = BitUtils.packBits(cap.transportTypes) } catch (e: Exception) { firstFailure = IllegalStateException(