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

Commit 9ddc8bfd authored by Benedict Wong's avatar Benedict Wong Committed by Automerger Merge Worker
Browse files

Merge "Shorten safe mode timer in VCN test mode" am: 3923c3ac 

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

Change-Id: If504d10f34d8f2a3f7c49e01c712cc6e331c962c
parents 9396b7d3 3923c3ac

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() {