commit 4c36cd8922ca0e8c451d0b8310791433ba971844
author chaviw <chaviw@google.com> Thu Nov 18 10:37:33 2021 -0600
committer chaviw <chaviw@google.com> Thu Nov 18 10:37:33 2021 -0600
tree f4e35c1278dfd916c737ef26262d181acdfeff0f
parent 4b26b7fb4604ded2ec4e2bb3e4f40a76c48c6fcf

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

diff --git a/libs/gui/LayerState.cpp b/libs/gui/LayerState.cpp
index 54735fa..d266229 100644
--- a/libs/gui/LayerState.cpp
+++ b/libs/gui/LayerState.cpp
@@ -573,6 +573,10 @@
         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,