Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9f42f7b8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

Merge "Fix brightness change during rotation when playing HDR videos." into tm-dev am: a0292d14 am: 5f5f81f4 am: 48036751

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/18500154



Change-Id: I258e5f615925a5cbdd38d3bcd1ff8e1615a52323
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3ca85bdd 48036751

services/surfaceflinger/SurfaceFlinger.cpp

+1 −0
Original line number Original line Diff line number Diff line
@@ -6765,6 +6765,7 @@ ftl::SharedFuture<FenceResult> SurfaceFlinger::renderScreenImpl( 
    clientCompositionDisplay.orientation = rotation;

    clientCompositionDisplay.orientation = rotation;





    clientCompositionDisplay.outputDataspace = dataspace;

    clientCompositionDisplay.outputDataspace = dataspace;

    clientCompositionDisplay.currentLuminanceNits = displayBrightnessNits;

    clientCompositionDisplay.maxLuminance = DisplayDevice::sDefaultMaxLumiance;

    clientCompositionDisplay.maxLuminance = DisplayDevice::sDefaultMaxLumiance;

    clientCompositionDisplay.renderIntent =

    clientCompositionDisplay.renderIntent =

            static_cast<aidl::android::hardware::graphics::composer3::RenderIntent>(renderIntent);

            static_cast<aidl::android::hardware::graphics::composer3::RenderIntent>(renderIntent);