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

Commit 8b255e41 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

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



Change-Id: I13439f06214440e35a194409f702a2fbe76169ad
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c68b4f11 0ba469a7

services/surfaceflinger/SurfaceFlinger.cpp

+6 −1
Original line number Diff line number Diff line
@@ -6713,6 +6713,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) {
@@ -6726,6 +6729,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;
@@ -6784,7 +6789,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 =