Assign renderintent when making SDR screenshots.
This is a no-op since we only use it for HDR tonemapping but it makes
this code clearer.
Bug: 293560925
Bug: 298219334
Test: builds, boots
Test: HDR video playback and screen rotation
Change-Id: I9ba024d8d138d4c21178c98a961332073b98fc50
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 6d4d186..f07b6b2 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -7814,10 +7814,9 @@
displayBrightnessNits = std::min(sdrWhitePointNits * kMaxScreenshotHeadroom,
displayBrightnessNits);
}
-
- if (requestedDataspace == ui::Dataspace::UNKNOWN) {
- renderIntent = state.renderIntent;
- }
+ }
+ if (requestedDataspace == ui::Dataspace::UNKNOWN) {
+ renderIntent = state.renderIntent;
}
}
}