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

Commit 79647aa2 authored by Sally Qi's avatar Sally Qi Committed by Automerger Merge Worker
Browse files

Merge "Fix rotation flicker issue when screenshot rotates with HDR content."... 

Merge "Fix rotation flicker issue when screenshot rotates with HDR content." into tm-dev am: 0ba469a7 am: fe1df994

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



Change-Id: I065dac88f19bcfb09dba3781169996faf03d12e3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b4f143d0 fe1df994

services/surfaceflinger/SurfaceFlinger.cpp

+6 −1
Original line number Diff line number Diff line
@@ -6655,6 +6655,9 @@ std::shared_future<renderengine::RenderEngineResult> SurfaceFlinger::renderScree 
    auto dataspace = renderArea.getReqDataSpace();

    auto parent = renderArea.getParentLayer();

    auto renderIntent = RenderIntent::TONE_MAP_COLORIMETRIC;

    auto sdrWhitePointNits = DisplayDevice::sDefaultMaxLumiance;

    auto displayBrightnessNits = DisplayDevice::sDefaultMaxLumiance;



    if ((dataspace == ui::Dataspace::UNKNOWN) && (parent != nullptr)) {

        Mutex::Autolock lock(mStateLock);

        auto display = findDisplay([layerStack = parent->getLayerStack()](const auto& display) {
@@ -6668,6 +6671,8 @@ std::shared_future<renderengine::RenderEngineResult> SurfaceFlinger::renderScree 
        const ui::ColorMode colorMode = display->getCompositionDisplay()->getState().colorMode;

        dataspace = pickDataspaceFromColorMode(colorMode);

        renderIntent = display->getCompositionDisplay()->getState().renderIntent;

        sdrWhitePointNits = display->getCompositionDisplay()->getState().sdrWhitePointNits;

        displayBrightnessNits = display->getCompositionDisplay()->getState().displayBrightnessNits;

    }

    captureResults.capturedDataspace = dataspace;
@@ -6726,7 +6731,7 @@ std::shared_future<renderengine::RenderEngineResult> SurfaceFlinger::renderScree 
                                       BlurSetting::Disabled

                             : compositionengine::LayerFE::ClientCompositionTargetSettings::

                                       BlurSetting::Enabled,

                DisplayDevice::sDefaultMaxLumiance,

                isHdrDataspace(dataspace) ? displayBrightnessNits : sdrWhitePointNits,



        };

        std::vector<compositionengine::LayerFE::LayerSettings> results =