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

Commit b27ce5f8 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

Change-Id: Ibdb905e1fcff414a5ca5ab0be10ab203a774f5f3
parents af55d777 7291aad9

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.