commit 91b346a484de18fa4bb3809629fb23060fe74625
author Arthur Hung <arthurhung@google.com> Mon Mar 14 21:36:22 2022 +0800
committer Arthur Hung <arthurhung@google.com> Tue Mar 15 01:29:04 2022 +0000
tree 53d030cbe200303d42fa18a30eff1ba3fddeeff1
parent e1c6809d35754caad6a8657666a163f5c21242eb

Merge ColorSpaceAgnosticChanged property in a transactioin

Make sure ColorSpaceAgnosticChanged could be merged.

Test: manual
Fixes: 224493490
Change-Id: Ie47968698c3500ab3c1ad7a37a84b5dbe82eac95

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,