From 010e0548469dd5148833192eb318db4acca1d3b4 Mon Sep 17 00:00:00 2001
From: Merissa Tan <liyingtan@google.com>
Date: Thu, 7 Apr 2022 13:12:43 -0700
Subject: [PATCH] Restrict TaskDisplayArea background color setting to tasks
 with fullscreen windowing mode.

Recall: http://recall/clips/3a64e84e-dc27-4a87-a539-2171ad8ba311

Bug: 204253858
Test: Open and close an activity in freeform windowing mode. Ensure that
a blank gray screen does not appear.

Change-Id: I3927d9c6b3f9a72253ef87abcd59325c495f8206
(cherry picked from commit 0ce2d88658d887a4f548e2e05319b3165858bc6c)
---
 services/core/java/com/android/server/wm/WindowContainer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/wm/WindowContainer.java b/services/core/java/com/android/server/wm/WindowContainer.java
index 2900a5df61987..6cfa11b8082e2 100644
--- a/services/core/java/com/android/server/wm/WindowContainer.java
+++ b/services/core/java/com/android/server/wm/WindowContainer.java
@@ -2995,7 +2995,7 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer<
 
             AnimationRunnerBuilder animationRunnerBuilder = new AnimationRunnerBuilder();
 
-            if (isTaskTransitOld(transit)) {
+            if (isTaskTransitOld(transit) && getWindowingMode() == WINDOWING_MODE_FULLSCREEN) {
                 animationRunnerBuilder.setTaskBackgroundColor(getTaskAnimationBackgroundColor());
                 // TODO: Remove when we migrate to shell (b/202383002)
                 if (mWmService.mTaskTransitionSpec != null) {