From 4c36cd8922ca0e8c451d0b8310791433ba971844 Mon Sep 17 00:00:00 2001
From: chaviw <chaviw@google.com>
Date: Thu, 18 Nov 2021 10:37:33 -0600
Subject: Merge color property in a transaction

The LayerState.merge code didn't have colors getting merged

Test: Builds
Fixes: 206341593
Change-Id: Ic2721242c772099802f635f8019cb3b7a24d6c90
---
 libs/gui/LayerState.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'libs/gui/LayerState.cpp')

diff --git a/libs/gui/LayerState.cpp b/libs/gui/LayerState.cpp
index 54735fa133..d266229a8e 100644
--- a/libs/gui/LayerState.cpp
+++ b/libs/gui/LayerState.cpp
@@ -573,6 +573,10 @@ void layer_state_t::merge(const layer_state_t& other) {
         what |= eDropInputModeChanged;
         dropInputMode = other.dropInputMode;
     }
+    if (other.what & eColorChanged) {
+        what |= eColorChanged;
+        color = other.color;
+    }
     if ((other.what & what) != other.what) {
         ALOGE("Unmerged SurfaceComposer Transaction properties. LayerState::merge needs updating? "
               "other.what=0x%" PRIu64 " what=0x%" PRIu64,
-- 
cgit v1.2.3-59-g8ed1b