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 am: 2d5ef8bed6

Browse Source 
Change-Id: I3f796cce02845511381321f1166d623aa537c206
This commit is contained in:
Ben Lin
2020-04-29 18:35:05 +00:00
committed by Automerger Merge Worker
parent 947fe29914 2d5ef8bed6
commit 20ae0c527e
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 // Check if the new configuration supports persistent bounds (eg. is Freeform) and if so
// restore the last recorded non-fullscreen bounds. // restore the last recorded non-fullscreen bounds.
final boolean prevPersistTaskBounds = getWindowConfiguration().persistTaskBounds(); final boolean prevPersistTaskBounds = getWindowConfiguration().persistTaskBounds();
final boolean nextPersistTaskBounds = boolean nextPersistTaskBounds =
getRequestedOverrideConfiguration().windowConfiguration.persistTaskBounds() getRequestedOverrideConfiguration().windowConfiguration.persistTaskBounds();
|| newParentConfig.windowConfiguration.persistTaskBounds(); if (getRequestedOverrideWindowingMode() == WINDOWING_MODE_UNDEFINED) {
nextPersistTaskBounds = newParentConfig.windowConfiguration.persistTaskBounds();
}
if (!prevPersistTaskBounds && nextPersistTaskBounds if (!prevPersistTaskBounds && nextPersistTaskBounds
&& mLastNonFullscreenBounds != null && !mLastNonFullscreenBounds.isEmpty()) { && mLastNonFullscreenBounds != null && !mLastNonFullscreenBounds.isEmpty()) {
// Bypass onRequestedOverrideConfigurationChanged here to avoid infinite loop. // Bypass onRequestedOverrideConfigurationChanged here to avoid infinite loop.