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

Commit 650df4ae authored by Andrii Kulian's avatar Andrii Kulian Committed by Android (Google) Code Review
Browse files

Merge "Use correct task bounds after updating override config" into nyc-dev

parents 5d4b11ef 73336d81

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
@@ -1518,6 +1518,9 @@ final class TaskRecord { 
    Rect updateOverrideConfigurationFromLaunchBounds() {

        final Rect bounds = validateBounds(getLaunchBounds());

        updateOverrideConfiguration(bounds);

        if (bounds != null) {

            bounds.set(mBounds);

        }

        return bounds;

    }