From 5985f02af9194858c59ee0cf24a8e3b524b43d63 Mon Sep 17 00:00:00 2001 From: Benedict Wong Date: Fri, 23 Jul 2021 11:51:09 -0700 Subject: [PATCH] Shorten safe mode timer in VCN test mode This change reduces the time required to test VCN safe mode in CTS, in order to meet the 30s CTS quality bar Bug: 193482882 Test: atest --iterations 10 android.net.vcn.cts.VcnManagerTest Original-Change: googleplex-android-review.git.corp.google.com/15375749 Change-Id: Ibbf7132d45a7a0e5554b74fda6b3e309ee2d9c44 Merged-In: Ibbf7132d45a7a0e5554b74fda6b3e309ee2d9c44 --- .../java/com/android/server/vcn/VcnGatewayConnection.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/vcn/VcnGatewayConnection.java b/services/core/java/com/android/server/vcn/VcnGatewayConnection.java index 38427697a9cd5..dfecdbee2dc5e 100644 --- a/services/core/java/com/android/server/vcn/VcnGatewayConnection.java +++ b/services/core/java/com/android/server/vcn/VcnGatewayConnection.java @@ -194,6 +194,7 @@ public class VcnGatewayConnection extends StateMachine { @VisibleForTesting(visibility = Visibility.PRIVATE) static final int SAFEMODE_TIMEOUT_SECONDS = 30; + private static final int SAFEMODE_TIMEOUT_SECONDS_TEST_MODE = 10; private interface EventInfo {} @@ -1076,7 +1077,9 @@ public class VcnGatewayConnection extends StateMachine { createScheduledAlarm( SAFEMODE_TIMEOUT_ALARM, delayedMessage, - TimeUnit.SECONDS.toMillis(SAFEMODE_TIMEOUT_SECONDS)); + mVcnContext.isInTestMode() + ? TimeUnit.SECONDS.toMillis(SAFEMODE_TIMEOUT_SECONDS_TEST_MODE) + : TimeUnit.SECONDS.toMillis(SAFEMODE_TIMEOUT_SECONDS)); } private void cancelSafeModeAlarm() {