commit 0094dc6dab7b255bb4a85baba116a2dc20409bec
author Ady Abraham <adyabr@google.com> Thu Jun 03 10:08:33 2021 -0700
committer Ady Abraham <adyabr@google.com> Thu Jun 03 17:09:52 2021 +0000
tree 87c827faaea37dcee76d3cf02e80285bc7f65868
parent f824b538078f701b6881db46b630378b55a66dd0

SF: populate state correctly in Display::applyLayerRequestsToLayers

Fix a bug where we update a local copy of the state instead of updating it.

Bug: 189076031
Test: db shell /data/nativetest64/libcompositionengine_test/libcompositionengine_test
Change-Id: I15bd19e3ba468e39a938584246a02337087fa612

services/surfaceflinger/CompositionEngine/src/Display.cpp

diff --git a/services/surfaceflinger/CompositionEngine/src/Display.cpp b/services/surfaceflinger/CompositionEngine/src/Display.cpp
index 953eb76..3d49183 100644
--- a/services/surfaceflinger/CompositionEngine/src/Display.cpp
+++ b/services/surfaceflinger/CompositionEngine/src/Display.cpp
@@ -344,8 +344,8 @@
     if (clientTargetProperty.dataspace == ui::Dataspace::UNKNOWN) {
         return;
     }
-    auto outputState = editState();
-    outputState.dataspace = clientTargetProperty.dataspace;
+
+    editState().dataspace = clientTargetProperty.dataspace;
     getRenderSurface()->setBufferDataspace(clientTargetProperty.dataspace);
     getRenderSurface()->setBufferPixelFormat(clientTargetProperty.pixelFormat);
 }