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

Commit 57a4ecb1 authored by Orhan Uysal's avatar Orhan Uysal
Browse files

Mark lastNonFullscreenBounds as null. 

Bug: 416384386
Test: m
Flag: EXEMPT Adding annotation
Change-Id: I83ef28750bdbd793043c2302664390cc74d04e59
parent ef95f272

core/java/android/app/TaskInfo.java

+1 −0
Original line number Diff line number Diff line
@@ -323,6 +323,7 @@ public class TaskInfo { 
     * The last non-fullscreen bounds the task was launched in or resized to.

     * @hide

     */

    @Nullable

    public Rect lastNonFullscreenBounds;



    /**

libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopPipTransitionController.kt

+2 −5
Original line number Diff line number Diff line
@@ -64,11 +64,8 @@ class DesktopPipTransitionController( 
        }



        val defaultFreeformBounds =

            if (parentTask.lastNonFullscreenBounds.isEmpty) {

                calculateDefaultDesktopTaskBounds(pipDesktopState.getCurrentDisplayLayout())

            } else {

                parentTask.lastNonFullscreenBounds

            }

            parentTask.lastNonFullscreenBounds?.takeUnless { it.isEmpty }

                ?: calculateDefaultDesktopTaskBounds(pipDesktopState.getCurrentDisplayLayout())



        val newResolvedWinMode =

            if (pipDesktopState.isPipInDesktopMode()) WINDOWING_MODE_FREEFORM