commit f4b49765605223dba7b804c351a98a3c6bb676f9
author Arthur Hung <arthurhung@google.com> Mon Mar 21 14:43:18 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 21 14:43:18 2022 +0000
tree e038d12ff5cecb59503672e9beab5fa24fbaa1f5
parent 4cfcc51b866fbd8dc8f2946f814770c00252a688
parent 91b346a484de18fa4bb3809629fb23060fe74625

Merge "Merge ColorSpaceAgnosticChanged property in a transactioin" into tm-dev

libs/gui/LayerState.cpp

diff --git a/libs/gui/LayerState.cpp b/libs/gui/LayerState.cpp
index 338ff11..49b669e 100644
--- a/libs/gui/LayerState.cpp
+++ b/libs/gui/LayerState.cpp
@@ -594,6 +594,10 @@
         what |= eColorChanged;
         color = other.color;
     }
+    if (other.what & eColorSpaceAgnosticChanged) {
+        what |= eColorSpaceAgnosticChanged;
+        colorSpaceAgnostic = other.colorSpaceAgnostic;
+    }
     if ((other.what & what) != other.what) {
         ALOGE("Unmerged SurfaceComposer Transaction properties. LayerState::merge needs updating? "
               "other.what=0x%" PRIX64 " what=0x%" PRIX64 " unmerged flags=0x%" PRIX64,