summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Benedict Wong <benedictwong@google.com> 2021-07-23 11:51:09 -0700
committer Benedict Wong <benedictwong@google.com> 2021-07-23 21:24:03 +0000
commitdc005a050794923e69ad01240905ca31bb68c87c (patch)
tree6d9c1eaf7f5fa81e6e07fe733483da0dc5032c64
parent715ab391499c3e1a11245e8bd68c0831291c90b9 (diff)
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 Change-Id: Ibbf7132d45a7a0e5554b74fda6b3e309ee2d9c44
-rw-r--r--services/core/java/com/android/server/vcn/VcnGatewayConnection.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/vcn/VcnGatewayConnection.java b/services/core/java/com/android/server/vcn/VcnGatewayConnection.java
index 3c0a05b6edf7..450257fcdecb 100644
--- a/services/core/java/com/android/server/vcn/VcnGatewayConnection.java
+++ b/services/core/java/com/android/server/vcn/VcnGatewayConnection.java
@@ -195,6 +195,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 {}
@@ -1082,7 +1083,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() {