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

Commit 2bfd49b2 authored by Yan Yan's avatar Yan Yan Committed by Automerger Merge Worker
Browse files

Merge "Clean up safe_mode_config flag check in the functional code" into main am: 642e90e9 

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



Change-Id: I17170f93042279269d7933df06acba645b4ee98d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 493e17a4 642e90e9

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

+1 −4
Original line number Diff line number Diff line
@@ -1228,10 +1228,7 @@ public class VcnGatewayConnection extends StateMachine { 


    @VisibleForTesting(visibility = Visibility.PRIVATE)

    void setSafeModeAlarm() {

        final boolean isFlagSafeModeConfigEnabled = mVcnContext.getFeatureFlags().safeModeConfig();

        logVdbg("isFlagSafeModeConfigEnabled " + isFlagSafeModeConfigEnabled);



        if (isFlagSafeModeConfigEnabled && !mConnectionConfig.isSafeModeEnabled()) {

        if (!mConnectionConfig.isSafeModeEnabled()) {

            logVdbg("setSafeModeAlarm: safe mode disabled");

            return;

        }

tests/vcn/java/com/android/server/vcn/VcnGatewayConnectionConnectedStateTest.java

+2 −22
Original line number Diff line number Diff line
@@ -659,7 +659,6 @@ public class VcnGatewayConnectionConnectedStateTest extends VcnGatewayConnection 


    private void verifySetSafeModeAlarm(

            boolean safeModeEnabledByCaller,

            boolean safeModeConfigFlagEnabled,

            boolean expectingSafeModeEnabled)

            throws Exception {

        final VcnGatewayConnectionConfig config =
@@ -670,7 +669,6 @@ public class VcnGatewayConnectionConnectedStateTest extends VcnGatewayConnection 
                mock(VcnGatewayConnection.Dependencies.class);

        setUpWakeupMessage(

                mSafeModeTimeoutAlarm, VcnGatewayConnection.SAFEMODE_TIMEOUT_ALARM, deps);

        doReturn(safeModeConfigFlagEnabled).when(mFeatureFlags).safeModeConfig();



        final VcnGatewayConnection connection =

                new VcnGatewayConnection(
@@ -694,37 +692,19 @@ public class VcnGatewayConnectionConnectedStateTest extends VcnGatewayConnection 
    }



    @Test

    public void testSafeModeEnabled_configFlagEnabled() throws Exception {

    public void testSafeModeEnabled() throws Exception {

        verifySetSafeModeAlarm(

                true /* safeModeEnabledByCaller */,

                true /* safeModeConfigFlagEnabled */,

                true /* expectingSafeModeEnabled */);

    }



    @Test

    public void testSafeModeEnabled_configFlagDisabled() throws Exception {

        verifySetSafeModeAlarm(

                true /* safeModeEnabledByCaller */,

                false /* safeModeConfigFlagEnabled */,

                true /* expectingSafeModeEnabled */);

    }



    @Test

    public void testSafeModeDisabled_configFlagEnabled() throws Exception {

    public void testSafeModeDisabled() throws Exception {

        verifySetSafeModeAlarm(

                false /* safeModeEnabledByCaller */,

                true /* safeModeConfigFlagEnabled */,

                false /* expectingSafeModeEnabled */);

    }



    @Test

    public void testSafeModeDisabled_configFlagDisabled() throws Exception {

        verifySetSafeModeAlarm(

                false /* safeModeEnabledByCaller */,

                false /* safeModeConfigFlagEnabled */,

                true /* expectingSafeModeEnabled */);

    }



    private Consumer<VcnNetworkAgent> setupNetworkAndGetUnwantedCallback() {

        triggerChildOpened();

        mTestLooper.dispatchAll();