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

Commit ec605b53 authored by Ben Lin's avatar Ben Lin Committed by Automerger Merge Worker
Browse files

Merge "Don't check parent's persistTaskBounds unless child is UNDEFINED." into... 

Merge "Don't check parent's persistTaskBounds unless child is UNDEFINED." into rvc-dev am: 7291aad9 am: 2d5ef8be am: 20ae0c52

Change-Id: Ia636a4e104a641210881b2b6df1a3f4bb5131a1a
parents 6a87f28f 20ae0c52

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

+5 −3
Original line number Diff line number Diff line
@@ -1930,9 +1930,11 @@ class Task extends WindowContainer<WindowContainer> { 
        // Check if the new configuration supports persistent bounds (eg. is Freeform) and if so

        // restore the last recorded non-fullscreen bounds.

        final boolean prevPersistTaskBounds = getWindowConfiguration().persistTaskBounds();

        final boolean nextPersistTaskBounds =

                getRequestedOverrideConfiguration().windowConfiguration.persistTaskBounds()

                || newParentConfig.windowConfiguration.persistTaskBounds();

        boolean nextPersistTaskBounds =

                getRequestedOverrideConfiguration().windowConfiguration.persistTaskBounds();

        if (getRequestedOverrideWindowingMode() == WINDOWING_MODE_UNDEFINED) {

            nextPersistTaskBounds = newParentConfig.windowConfiguration.persistTaskBounds();

        }

        if (!prevPersistTaskBounds && nextPersistTaskBounds

                && mLastNonFullscreenBounds != null && !mLastNonFullscreenBounds.isEmpty()) {

            // Bypass onRequestedOverrideConfigurationChanged here to avoid infinite loop.