commit 361e7e1355bea5b64bbfab4e2c43e3f060108a3b
author Alec Mouri <alecmouri@google.com> Fri Sep 15 21:45:10 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 15 21:45:10 2023 +0000
tree 59bd441057c4469685b0683be2e8157a4af550cb
parent 3429439b89d4d33e08313d9185ea353d026632e0
parent 5e488f883a1a190f8807e27f90b6837422a829db

Merge "Assign renderintent when making SDR screenshots." into main

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index e1cc93a..66a3a8e 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -7828,10 +7828,9 @@
                     displayBrightnessNits = std::min(sdrWhitePointNits * kMaxScreenshotHeadroom,
                                                      displayBrightnessNits);
                 }
-
-                if (requestedDataspace == ui::Dataspace::UNKNOWN) {
-                    renderIntent = state.renderIntent;
-                }
+            }
+            if (requestedDataspace == ui::Dataspace::UNKNOWN) {
+                renderIntent = state.renderIntent;
             }
         }
     }