Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Shorten safe mode timer in VCN test mode" into sc-dev

Browse Source
This commit is contained in:
Benedict Wong
2021-07-23 23:07:21 +00:00
committed by Android (Google) Code Review
parent 783b527615 dc005a0507
commit 6ad35a74d8
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/vcn/VcnGatewayConnection.java
View File

@@ -195,6 +195,7 @@ public class VcnGatewayConnection extends StateMachine {
@VisibleForTesting(visibility = Visibility.PRIVATE) @VisibleForTesting(visibility = Visibility.PRIVATE)
static final int SAFEMODE_TIMEOUT_SECONDS = 30; static final int SAFEMODE_TIMEOUT_SECONDS = 30;
private static final int SAFEMODE_TIMEOUT_SECONDS_TEST_MODE = 10;
private interface EventInfo {} private interface EventInfo {}
@@ -1082,7 +1083,9 @@ public class VcnGatewayConnection extends StateMachine {
createScheduledAlarm( createScheduledAlarm(
SAFEMODE_TIMEOUT_ALARM, SAFEMODE_TIMEOUT_ALARM,
delayedMessage, 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() { private void cancelSafeModeAlarm() {