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

Merge "Don't increment colorLayerCounter on surface migration" into sc-v2-dev

Browse Source
This commit is contained in:
Pablo Gamito
2022-03-22 11:10:28 +00:00
committed by Android (Google) Code Review
parent 4f310078e9 6a1d698ace
commit c6c53dbf39
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
services/core/java/com/android/server/wm/TaskDisplayArea.java
View File

@@ -971,9 +971,19 @@ final class TaskDisplayArea extends DisplayArea<WindowContainer> {
} }
void setBackgroundColor(@ColorInt int colorInt) { void setBackgroundColor(@ColorInt int colorInt) {
setBackgroundColor(colorInt, false /* restore */);
}
void setBackgroundColor(@ColorInt int colorInt, boolean restore) {
mBackgroundColor = colorInt; mBackgroundColor = colorInt;
Color color = Color.valueOf(colorInt); Color color = Color.valueOf(colorInt);
mColorLayerCounter++;
// We don't want to increment the mColorLayerCounter if we are restoring the background
// color after a surface migration because in that case the mColorLayerCounter already
// accounts for setting that background color.
if (!restore) {
mColorLayerCounter++;
}
// Only apply the background color if the TDA is actually attached and has a valid surface // Only apply the background color if the TDA is actually attached and has a valid surface
// to set the background color on. We still want to keep track of the background color state // to set the background color on. We still want to keep track of the background color state
@@ -1002,7 +1012,7 @@ final class TaskDisplayArea extends DisplayArea<WindowContainer> {
super.migrateToNewSurfaceControl(t); super.migrateToNewSurfaceControl(t);
if (mColorLayerCounter > 0) { if (mColorLayerCounter > 0) {
setBackgroundColor(mBackgroundColor); setBackgroundColor(mBackgroundColor, true /* restore */);
} }
// As TaskDisplayArea is getting a new surface, reparent and reorder the child surfaces. // As TaskDisplayArea is getting a new surface, reparent and reorder the child surfaces.