commit c44a1ffe6e278e167246c2cf0a6e75266630beb0
author Alec Mouri <alecmouri@google.com> Fri May 19 23:49:05 2023 +0000
committer Alec Mouri <alecmouri@google.com> Sat May 20 00:06:35 2023 +0000
tree 31711e3f08cb4468b6ead71e42df187ca7cfec49
parent 3a4f049f770642ca4ef5469a4002ea467841125a

Fix SurfaceFlinger_test on WCG devices

Some tests force sRGB screenshots for consistent test output. Make sure
that output colorspace is still respected.

Bug: 283305205
Test: SurfaceFlinger_test
Change-Id: I42ffe36022fa65568bcd75df28a33389340a7d7f

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 5d96fc4..6cac25e 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -7046,9 +7046,9 @@
     }
 
     RenderAreaFuture renderAreaFuture = ftl::defer([=] {
-        return DisplayRenderArea::create(displayWeak, args.sourceCrop, reqSize,
-                                         ui::Dataspace::UNKNOWN, args.useIdentityTransform,
-                                         args.hintForSeamlessTransition, args.captureSecureLayers);
+        return DisplayRenderArea::create(displayWeak, args.sourceCrop, reqSize, args.dataspace,
+                                         args.useIdentityTransform, args.hintForSeamlessTransition,
+                                         args.captureSecureLayers);
     });
 
     GetLayerSnapshotsFunction getLayerSnapshots;