commit e258f09e258633f862b6f1349949254e6bcd858e
author Sally Qi <sallyqi@google.com> Thu May 19 15:24:12 2022 -0700
committer Sally Qi <sallyqi@google.com> Tue May 31 11:17:34 2022 -0700
tree 0508332f6a27d0bac248beb1a3c1f7796e344757
parent 97c6f77943da3d8646682e48540c0561e3ade620

Fix brightness change during rotation when playing HDR videos.

- Update current luminance value with HDR displayBrightnessNits

Bug: 231915084
Test: screen rotates when playing HDR videos in adaptive mode
Change-Id: I6c0e69aec3b461d4c1a91efbf50d3a570394543b

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);