commit 11595687cb64ef66b390deaf9aca9f891423afd5
author Chavi Weingarten <chaviw@google.com> Thu Nov 18 21:01:34 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Nov 18 21:01:34 2021 +0000
tree 433e0a6ca76492021e83bf36004e270e65694a8c
parent 2731fe5378813950162c69d91ae865d8e54f1cdb
parent 4c36cd8922ca0e8c451d0b8310791433ba971844

Merge "Merge color property in a transaction" into sc-v2-dev

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,