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

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

Browse Source 
This is something that sometimes occurs in tests since the detaching of the TDA in not necesseraily synchronized with animations

Test: atest CtsWindowManagerDeviceTestCases:MultiDisplaySystemDecorationTests
Bug: 207667555
Bug: 209936970
Merged-In: I9881453ba14cba4f219861ec4449f2baa8058b57
Change-Id: I9881453ba14cba4f219861ec4449f2baa8058b57
(cherry picked from commit e644ff6102)
This commit is contained in:
Pablo Gamito
2021-11-24 19:57:52 +01:00
parent 975e9ab45b
commit da737e7149
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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