commit d438bc2a406f98b211c1c18f16158207457b0109
author Toshiki Kikuchi <toshikikikuchi@google.com> Tue Jun 10 20:05:45 2025 +0900
committer Toshiki Kikuchi <toshikikikuchi@google.com> Wed Jun 11 04:12:19 2025 -0700
tree f29629c64695d080bd99b75c7ddd87d2f250c8c1
parent 1b1a3622f8510aa5baf38b0c383ec9f8bc2e7cca

Use task instead of sourceTask to detect the fullscreen launch

This CL fixes the usage of `task` vs `sourceTask` to detect the
fullscreen launch case.
In Ib48752887e7dfd685135c1e0b0e96cd6186708b2, the line unintentionally
uses `sourceTask` although it looks at the launch windowing mode of the
launching task itself (i.e., `task`).

Flag: EXEMPT - bug fix
Bug: 419348338
Bug: 416953378
Bug: 422035204
Bug: 419110280
Test: DesktopModeLaunchParamsModifierTests
Test: manual - Install a new app and launch it in desktop-first mode
Test: manual - Circle-to-search issue (b/410554758)
Change-Id: I2281ef0ec222219d891830d29959efe41a0160b8

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

diff --git a/services/core/java/com/android/server/wm/DesktopModeLaunchParamsModifier.java b/services/core/java/com/android/server/wm/DesktopModeLaunchParamsModifier.java
index ee27bb4..2e33018 100644
--- a/services/core/java/com/android/server/wm/DesktopModeLaunchParamsModifier.java
+++ b/services/core/java/com/android/server/wm/DesktopModeLaunchParamsModifier.java
@@ -159,7 +159,7 @@
             final Task sourceTask = source.getTask();
             // Don't explicitly set to freeform if task is launching in full-screen in desktop-first
             // container, as it should already inherit freeform by default if undefined.
-            requestFullscreen |= sourceTask.getWindowingMode() == WINDOWING_MODE_FULLSCREEN;
+            requestFullscreen |= task.getWindowingMode() == WINDOWING_MODE_FULLSCREEN;
             isFullscreenInDeskTask = inDesktopFirstContainer && requestFullscreen;
             if (DesktopModeFlags.DISABLE_DESKTOP_LAUNCH_PARAMS_OUTSIDE_DESKTOP_BUG_FIX.isTrue()
                     && isEnteringDesktopMode(sourceTask, options, currentParams)

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

diff --git a/services/tests/wmtests/src/com/android/server/wm/DesktopModeLaunchParamsModifierTests.java b/services/tests/wmtests/src/com/android/server/wm/DesktopModeLaunchParamsModifierTests.java
index a56eaf4..b672af4 100644
--- a/services/tests/wmtests/src/com/android/server/wm/DesktopModeLaunchParamsModifierTests.java
+++ b/services/tests/wmtests/src/com/android/server/wm/DesktopModeLaunchParamsModifierTests.java
@@ -1620,13 +1620,16 @@
     public void testInMultiDesk_requestFullscreen_returnDone() {
         setupDesktopModeLaunchParamsModifier();
 
-        final Task task = new TaskBuilder(mSupervisor).setActivityType(
-                ACTIVITY_TYPE_STANDARD).setCreatedByOrganizer(true).build();
+        final Task deskRoot = new TaskBuilder(mSupervisor).setActivityType(
+                ACTIVITY_TYPE_STANDARD).setWindowingMode(WINDOWING_MODE_FREEFORM)
+                .setCreatedByOrganizer(true).build();
         final Task sourceTask = new TaskBuilder(mSupervisor).setActivityType(
                 ACTIVITY_TYPE_STANDARD).setWindowingMode(WINDOWING_MODE_FULLSCREEN).build();
+        // Creating a fullscreen task under the desk root.
+        final Task task = new TaskBuilder(mSupervisor).setActivityType(
+                ACTIVITY_TYPE_STANDARD).setWindowingMode(WINDOWING_MODE_FULLSCREEN)
+                .setParentTask(deskRoot).build();
 
-        assertNotNull(task.getCreatedByOrganizerTask());
-        task.getCreatedByOrganizerTask().setWindowingMode(WINDOWING_MODE_FREEFORM);
         final ActivityRecord sourceActivity = new ActivityBuilder(task.mAtmService)
                 .setTask(sourceTask).build();