From 1293f319cd885b0228f8ada8cb16d23067857332 Mon Sep 17 00:00:00 2001
From: Mariia Sandrikova <mariiasand@google.com>
Date: Thu, 4 Feb 2021 17:38:16 +0000
Subject: [PATCH] Apply letterbox changes when background color changes.

Fix: 179380577
Test: atest LetterboxTest
Change-Id: Ieedbb2a30bd66ee1aa474eed9e5c9b013520a838
---
 services/core/java/com/android/server/wm/Letterbox.java       | 2 +-
 .../wmtests/src/com/android/server/wm/LetterboxTest.java      | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/wm/Letterbox.java b/services/core/java/com/android/server/wm/Letterbox.java
index 2274a4a915952..99c9e798c605b 100644
--- a/services/core/java/com/android/server/wm/Letterbox.java
+++ b/services/core/java/com/android/server/wm/Letterbox.java
@@ -340,7 +340,7 @@ public class Letterbox {
         }
 
         public void applySurfaceChanges(SurfaceControl.Transaction t) {
-            if (mSurfaceFrameRelative.equals(mLayoutFrameRelative)) {
+            if (!needsApplySurfaceChanges()) {
                 // Nothing changed.
                 return;
             }
diff --git a/services/tests/wmtests/src/com/android/server/wm/LetterboxTest.java b/services/tests/wmtests/src/com/android/server/wm/LetterboxTest.java
index fa3e3aefea3bf..7714a6cead1d1 100644
--- a/services/tests/wmtests/src/com/android/server/wm/LetterboxTest.java
+++ b/services/tests/wmtests/src/com/android/server/wm/LetterboxTest.java
@@ -183,6 +183,10 @@ public class LetterboxTest {
         mColor = Color.GREEN;
 
         assertTrue(mLetterbox.needsApplySurfaceChanges());
+
+        mLetterbox.applySurfaceChanges(mTransaction);
+
+        verify(mTransaction).setColor(mSurfaces.top, new float[]{0, 1, 0});
     }
 
     @Test