commit 03a8ff5c5ce9c6d8a4fd61cf44c057ca77c6c16a
author Melody Hsu <melodymhsu@google.com> Tue Jun 04 23:34:16 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 04 23:34:16 2024 +0000
tree d86e66d8ea061ae92aefe88f689ab1dea09dc58e
parent 683fe045ffbfd5de81ceb3385b73ad0d687f83a3
parent eddfe939edcc9b3f4ce73cb6c2de21f588856df8

Merge "Remove legacy layer path in screenshot pathway" into main

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index f0b390e..fb35010 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -7846,14 +7846,13 @@
 
 namespace {
 
-ui::Dataspace pickBestDataspace(ui::Dataspace requestedDataspace, const DisplayDevice* display,
+ui::Dataspace pickBestDataspace(ui::Dataspace requestedDataspace,
+                                const compositionengine::impl::OutputCompositionState& state,
                                 bool capturingHdrLayers, bool hintForSeamlessTransition) {
-    if (requestedDataspace != ui::Dataspace::UNKNOWN || display == nullptr) {
+    if (requestedDataspace != ui::Dataspace::UNKNOWN) {
         return requestedDataspace;
     }
 
-    const auto& state = display->getCompositionDisplay()->getState();
-
     const auto dataspaceForColorMode = ui::pickDataspaceFor(state.colorMode);
 
     // TODO: Enable once HDR screenshots are ready.
@@ -8316,8 +8315,7 @@
 
     if (display != nullptr) {
         captureResults.capturedDataspace =
-                pickBestDataspace(requestedDataspace, display.get(),
-                                  captureResults.capturedHdrLayers,
+                pickBestDataspace(requestedDataspace, state, captureResults.capturedHdrLayers,
                                   renderArea->getHintForSeamlessTransition());
         sdrWhitePointNits = state.sdrWhitePointNits;