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

Commit bbb9766e authored by Huihong Luo's avatar Huihong Luo Committed by Android (Google) Code Review
Browse files

Merge "Fix a potential memory crash for layer debug highlighting" into sc-dev

parents 11da40be c8c05ed3

services/surfaceflinger/CompositionEngine/src/planner/CachedSet.cpp

+2 −1
Original line number Diff line number Diff line
@@ -178,6 +178,7 @@ void CachedSet::render(renderengine::RenderEngine& renderEngine, 
    };



    std::vector<renderengine::LayerSettings> layerSettings;

    renderengine::LayerSettings highlight;

    for (const auto& layer : mLayers) {

        const auto clientCompositionList =

                layer.getState()->getOutputLayer()->getLayerFE().prepareClientCompositionList(
@@ -192,7 +193,7 @@ void CachedSet::render(renderengine::RenderEngine& renderEngine, 
                   [](const renderengine::LayerSettings& settings) { return &settings; });



    if (sDebugHighlighLayers) {

        renderengine::LayerSettings highlight{

        highlight = {

                .geometry =

                        renderengine::Geometry{

                                .boundaries = FloatRect(0.0f, 0.0f,