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

Commit fd731b04 authored by Eghosa Ewansiha-Vlachavas's avatar Eghosa Ewansiha-Vlachavas Committed by Android (Google) Code Review
Browse files

Merge "Replace freeform activity check with freeform task check in DMLPM" into main

parents 97ab1d48 b3e1c791

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

+3 −1
Original line number Diff line number Diff line
@@ -259,7 +259,9 @@ class DesktopModeLaunchParamsModifier implements LaunchParamsModifier { 
        //  activity will also enter desktop mode. On this same relationship, we can also assume

        //  if there are not visible freeform tasks but a freeform activity is now launching, it

        //  will force the device into desktop mode.

        return (task.getDisplayContent().getTopMostFreeformActivity() != null

        final Task visibleFreeformTask = task.getDisplayContent().getTask(

                t -> t.inFreeformWindowingMode() && t.isVisibleRequested());

        return (visibleFreeformTask != null

                    && checkSourceWindowModesCompatible(task, options, currentParams))

                || isRequestingFreeformWindowMode(task, options, currentParams);

    }

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

+1 −2
Original line number Diff line number Diff line
@@ -189,8 +189,7 @@ public class DesktopModeLaunchParamsModifierTests extends 
        final DisplayContent dc = spy(createNewDisplay());

        final Task existingFreeformTask = new TaskBuilder(mSupervisor).setCreateActivity(true)

                .setWindowingMode(WINDOWING_MODE_FREEFORM).build();

        doReturn(existingFreeformTask.getRootActivity()).when(dc)

                .getTopMostFreeformActivity();

        doReturn(existingFreeformTask).when(dc).getTask(any());

        final Task launchingTask = new TaskBuilder(mSupervisor).build();

        launchingTask.onDisplayChanged(dc);