Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 059d2294 authored by Benedict Wong's avatar Benedict Wong Committed by Automerger Merge Worker
Browse files

Merge "Shorten safe mode timer in VCN test mode" into sc-dev am: 6ad35a74 am: 12b31cac 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15375749

Change-Id: I0756d4c32eaa78f148db7636c75a56c95838659f
parents 59caafdd 12b31cac

services/core/java/com/android/server/vcn/VcnGatewayConnection.java

+4 −1
Original line number Diff line number Diff line
@@ -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() {