commit a0292d14c0ea5cdb6cc4444869f6abac95d1dfd3
author TreeHugger Robot <treehugger-gerrit@google.com> Tue May 31 22:42:50 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 31 22:42:50 2022 +0000
tree 6cb5a1d096fdb2fe40a84e59f6ae04183504f650
parent d29698422c7cb47b158d82a86a9bdda6e03d7f31
parent e258f09e258633f862b6f1349949254e6bcd858e

Merge "Fix brightness change during rotation when playing HDR videos." into tm-dev

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 97d8aef..6a17cd8 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -6747,6 +6747,7 @@
     clientCompositionDisplay.orientation = rotation;
 
     clientCompositionDisplay.outputDataspace = dataspace;
+    clientCompositionDisplay.currentLuminanceNits = displayBrightnessNits;
     clientCompositionDisplay.maxLuminance = DisplayDevice::sDefaultMaxLumiance;
     clientCompositionDisplay.renderIntent =
             static_cast<aidl::android::hardware::graphics::composer3::RenderIntent>(renderIntent);