commit b7edfc2cf375f6754e5ba1fa86ffe4e5413ffe19
author Alec Mouri <alecmouri@google.com> Wed Mar 17 16:20:26 2021 -0700
committer Alec Mouri <alecmouri@google.com> Tue Mar 23 15:25:18 2021 -0700
tree 15c73c7328ca085c80b6006de197681eee3e8b0c
parent 1da42f046525842aa515211a20dc1459cc699a42

Pass override dataspace to HWC

Bug: 181192086
Test: libcompositionengine_test
Test: Wallpaper colors no longer flicker
Change-Id: If4c3a9b3a9151c271bbd55a657be0a6588524aaa

services/surfaceflinger/CompositionEngine/src/OutputLayer.cpp

diff --git a/services/surfaceflinger/CompositionEngine/src/OutputLayer.cpp b/services/surfaceflinger/CompositionEngine/src/OutputLayer.cpp
index b364649..ee6435c 100644
--- a/services/surfaceflinger/CompositionEngine/src/OutputLayer.cpp
+++ b/services/surfaceflinger/CompositionEngine/src/OutputLayer.cpp
@@ -431,11 +431,13 @@
         outputDependentState.outputSpaceVisibleRegion.dump(LOG_TAG);
     }
 
-    if (auto error = hwcLayer->setDataspace(outputDependentState.dataspace);
-        error != hal::Error::NONE) {
-        ALOGE("[%s] Failed to set dataspace %d: %s (%d)", getLayerFE().getDebugName(),
-              outputDependentState.dataspace, to_string(error).c_str(),
-              static_cast<int32_t>(error));
+    const auto dataspace = outputDependentState.overrideInfo.buffer
+            ? outputDependentState.overrideInfo.dataspace
+            : outputDependentState.dataspace;
+
+    if (auto error = hwcLayer->setDataspace(dataspace); error != hal::Error::NONE) {
+        ALOGE("[%s] Failed to set dataspace %d: %s (%d)", getLayerFE().getDebugName(), dataspace,
+              to_string(error).c_str(), static_cast<int32_t>(error));
     }
 }