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

Commit 29f3ad63 authored by Garfield Tan's avatar Garfield Tan Committed by Android (Google) Code Review
Browse files

Merge "Skip desktop mode LPM if desktop mode isn't on" into main

parents d97268ac 60e3bbe0

services/core/java/com/android/server/wm/DesktopModeLaunchParamsModifier.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -80,8 +80,8 @@ public class DesktopModeLaunchParamsModifier implements LaunchParamsModifier { 
            LaunchParamsController.LaunchParams outParams) {

            LaunchParamsController.LaunchParams outParams) {





        if (!canEnterDesktopMode(mContext)) {

        if (!canEnterDesktopMode(mContext)) {

            appendLog("desktop mode is not enabled, continuing");

            appendLog("desktop mode is not enabled, skipping");

            return RESULT_CONTINUE;

            return RESULT_SKIP;

        }

        }





        if (task == null) {

        if (task == null) {

services/tests/wmtests/src/com/android/server/wm/DesktopModeLaunchParamsModifierTests.java

+4 −4
Original line number Original line Diff line number Diff line
@@ -79,19 +79,19 @@ public class DesktopModeLaunchParamsModifierTests extends WindowTestsBase { 




    @Test

    @Test

    @DisableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_MODE)

    @DisableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_MODE)

    public void testReturnsContinueIfDesktopWindowingIsDisabled() {

    public void testReturnsSkipIfDesktopWindowingIsDisabled() {

        setupDesktopModeLaunchParamsModifier();

        setupDesktopModeLaunchParamsModifier();





        assertEquals(RESULT_CONTINUE, new CalculateRequestBuilder().setTask(null).calculate());

        assertEquals(RESULT_SKIP, new CalculateRequestBuilder().setTask(null).calculate());

    }

    }





    @Test

    @Test

    @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_MODE)

    @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_MODE)

    public void testReturnsContinueIfDesktopWindowingIsEnabledOnUnsupportedDevice() {

    public void testReturnsSkipIfDesktopWindowingIsEnabledOnUnsupportedDevice() {

        setupDesktopModeLaunchParamsModifier(/*isDesktopModeSupported=*/ false,

        setupDesktopModeLaunchParamsModifier(/*isDesktopModeSupported=*/ false,

                /*enforceDeviceRestrictions=*/ true);

                /*enforceDeviceRestrictions=*/ true);





        assertEquals(RESULT_CONTINUE, new CalculateRequestBuilder().setTask(null).calculate());

        assertEquals(RESULT_SKIP, new CalculateRequestBuilder().setTask(null).calculate());

    }

    }





    @Test

    @Test