Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't check parent's persistTaskBounds unless child is UNDEFINED." into rvc-dev am: 7291aad962

Browse Source 
Change-Id: I8669fcc0268dd1d6f7b48581484bddc5d5b5f938
This commit is contained in:
Ben Lin
2020-04-29 17:39:59 +00:00
committed by Automerger Merge Worker
parent 7f53da43bd 7291aad962
commit 2d5ef8bed6
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/wm/Task.java
View File

@@ -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.