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

Commit 73336d81 authored by Andrii Kulian's avatar Andrii Kulian
Browse files

Use correct task bounds after updating override config 

Use new task bounds after updating override configuration
when we move existing task to front or launch new one.
This fixes issues when task with defined minimal size is
launched in freeform or split-screen modes. In these cases
minimal size was not applied until task was resized manually.

Bug: 27621228
Change-Id: I0630962578815a77bfb556150cb71fec5a74ee37
parent 40e1135e

services/core/java/com/android/server/am/ActivityStackSupervisor.java

+1 −1
Original line number Diff line number Diff line
@@ -1798,7 +1798,7 @@ public final class ActivityStackSupervisor implements DisplayListener { 
                    // WM resizeTask must be done after the task is moved to the correct stack,

                    // because Task's setBounds() also updates dim layer's bounds, but that has

                    // dependency on the stack.

                    mWindowManager.resizeTask(task.taskId, bounds, task.mOverrideConfig,

                    mWindowManager.resizeTask(task.taskId, task.mBounds, task.mOverrideConfig,

                            false /* relayout */, false /* forced */);

                }

            }

services/core/java/com/android/server/am/TaskRecord.java

+3 −0
Original line number Diff line number Diff line
@@ -1502,6 +1502,9 @@ final class TaskRecord { 
    Rect updateOverrideConfigurationFromLaunchBounds() {

        final Rect bounds = validateBounds(getLaunchBounds());

        updateOverrideConfiguration(bounds);

        if (bounds != null) {

            bounds.set(mBounds);

        }

        return bounds;

    }