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" am: 3923c3acc6

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1776967

Change-Id: If504d10f34d8f2a3f7c49e01c712cc6e331c962c
This commit is contained in:
Benedict Wong
2021-07-23 23:46:18 +00:00
committed by Automerger Merge Worker
parent 9396b7d366 3923c3acc6
commit 9ddc8bfd13
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)
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() {