summaryrefslogtreecommitdiff
path: root/services/surfaceflinger/SurfaceFlinger.cpp
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2022-05-31 22:42:50 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2022-05-31 22:42:50 +0000
commita0292d14c0ea5cdb6cc4444869f6abac95d1dfd3 (patch)
tree6cb5a1d096fdb2fe40a84e59f6ae04183504f650 /services/surfaceflinger/SurfaceFlinger.cpp
parentd29698422c7cb47b158d82a86a9bdda6e03d7f31 (diff)
parente258f09e258633f862b6f1349949254e6bcd858e (diff)
Merge "Fix brightness change during rotation when playing HDR videos." into tm-dev
Diffstat (limited to 'services/surfaceflinger/SurfaceFlinger.cpp')
-rw-r--r--services/surfaceflinger/SurfaceFlinger.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 97d8aef88a..6a17cd8881 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -6747,6 +6747,7 @@ ftl::SharedFuture<FenceResult> SurfaceFlinger::renderScreenImpl(
clientCompositionDisplay.orientation = rotation;
clientCompositionDisplay.outputDataspace = dataspace;
+ clientCompositionDisplay.currentLuminanceNits = displayBrightnessNits;
clientCompositionDisplay.maxLuminance = DisplayDevice::sDefaultMaxLumiance;
clientCompositionDisplay.renderIntent =
static_cast<aidl::android::hardware::graphics::composer3::RenderIntent>(renderIntent);