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

Commit 65987459 authored by Jorge Gil's avatar Jorge Gil Committed by Automerger Merge Worker
Browse files

Merge "Only restore to mLastNonFullscreenBounds if requested bounds unset"... 

Merge "Only restore to mLastNonFullscreenBounds if requested bounds unset" into tm-qpr-dev am: 0c83561a

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18880191



Change-Id: I2f40f82f78c7f9e247def38503c0658d16d5d64f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c94f2f46 0c83561a

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

+5 −0
Original line number Diff line number Diff line
@@ -1858,6 +1858,11 @@ class Task extends TaskFragment { 
        if (getRequestedOverrideWindowingMode() == WINDOWING_MODE_UNDEFINED) {

            nextPersistTaskBounds = newParentConfig.windowConfiguration.persistTaskBounds();

        }

        // Only restore to the last non-fullscreen bounds when the requested override bounds

        // have not been explicitly set already.

        nextPersistTaskBounds &=

                (getRequestedOverrideConfiguration().windowConfiguration.getBounds() == null

                || getRequestedOverrideConfiguration().windowConfiguration.getBounds().isEmpty());

        if (!prevPersistTaskBounds && nextPersistTaskBounds

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

            // Bypass onRequestedOverrideConfigurationChanged here to avoid infinite loop.