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

Merge "Don't set background color if TDA doesn't have a valid surface"

Browse Source
This commit is contained in:
Pablo Gamito
2021-11-25 12:37:29 +00:00
committed by Android (Google) Code Review
parent d6fb34349d e644ff6102
commit ba5d54e9a2
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -909,18 +909,24 @@ final class TaskDisplayArea extends DisplayArea<WindowContainer> {
mBackgroundColor = colorInt;
Color color = Color.valueOf(colorInt);
mColorLayerCounter++;
getPendingTransaction()
.setColor(mSurfaceControl, new float[]{color.red(), color.green(), color.blue()});
scheduleAnimation();
// 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
// even if we are not showing it for when/if the TDA is reattached and gets a valid surface
if (mSurfaceControl != null) {
getPendingTransaction()
.setColor(mSurfaceControl,
new float[]{color.red(), color.green(), color.blue()});
scheduleAnimation();
}
}
void clearBackgroundColor() {
mColorLayerCounter--;
// Only clear the color layer if we have received the same amounts of clear as set
// requests.
if (mColorLayerCounter == 0) {
// requests and TDA has a non null surface control (i.e. is attached)
if (mColorLayerCounter == 0 && mSurfaceControl != null) {
getPendingTransaction().unsetColor(mSurfaceControl);
scheduleAnimation();
}