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

Commit 73fa2665 authored by Alec Mouri's avatar Alec Mouri
Browse files

Fix crash in Flattener dumpsys 

When there are multiple connected displays where only one of them is
powered on, then caching is enabled on all displays but may
historically only been used on one. This means that mInitialLayerCounts
may be empty, which breaks retrieving the max element with
std::max_element. Add an emptiness check to sidestep that issue.

Bug: 187736454
Test: dumpsys SurfaceFlinger --planner
Change-Id: Iee917bb75c89e47f92f3440dd58bc58755e1f7b4
parent 75a9dc09

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

+5 −3
Original line number Original line Diff line number Diff line
@@ -126,8 +126,10 @@ void Flattener::dump(std::string& result) const { 
        return left.first < right.first;

        return left.first < right.first;

    };

    };





    const size_t maxLayerCount = std::max_element(mInitialLayerCounts.cbegin(),

    const size_t maxLayerCount = mInitialLayerCounts.empty()

                                                  mInitialLayerCounts.cend(), compareLayerCounts)

            ? 0u

            : std::max_element(mInitialLayerCounts.cbegin(), mInitialLayerCounts.cend(),

                               compareLayerCounts)

                      ->first;

                      ->first;





    result.append("\n    Initial counts:\n");

    result.append("\n    Initial counts:\n");