From 67f19ea60a97d184ffd4e80e58b96243d6032052 Mon Sep 17 00:00:00 2001 From: Chiachang Wang Date: Wed, 22 Nov 2023 01:48:46 +0000 Subject: [PATCH] Reset the LISTEN_ACTIVITY_TIMEOUT_MS timer This is a clean up commit to address TODO for resetting the LISTEN_ACTIVITY_TIMEOUT_MS timer as aosp/2188755 was shipped. Fix: 252972908 Test: atest CtsNetTestCases Change-Id: Ibc1a1c68883a3772729f24b01f9dc8d3cc37c1eb --- .../net/src/android/net/cts/ConnectivityManagerTest.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java index 778f0c5429..58f6d58ad0 100644 --- a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java +++ b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java @@ -278,10 +278,8 @@ public class ConnectivityManagerTest { private static final int MIN_KEEPALIVE_INTERVAL = 10; private static final int NETWORK_CALLBACK_TIMEOUT_MS = 30_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; + // Timeout for waiting network to be validated. + private static final int LISTEN_ACTIVITY_TIMEOUT_MS = 5_000; private static final int NO_CALLBACK_TIMEOUT_MS = 100; private static final int NETWORK_REQUEST_TIMEOUT_MS = 3000; private static final int SOCKET_TIMEOUT_MS = 100;