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

Commit 42afe5fa authored by Vishnu Nair's avatar Vishnu Nair Committed by Android (Google) Code Review
Browse files

Merge "SF: Identify layers with buffers when dumping offscreen list"

parents c62024fb 76554eb4

services/surfaceflinger/Layer.cpp

+3 −2
Original line number Diff line number Diff line
@@ -1472,8 +1472,9 @@ void Layer::getFrameStats(FrameStats* outStats) const { 
    mFrameTracker.getStats(outStats);

}



void Layer::dumpCallingUidPid(std::string& result) const {

    StringAppendF(&result, "Layer %s (%s) ownerPid:%d ownerUid:%d\n", getName().c_str(), getType(),

void Layer::dumpOffscreenDebugInfo(std::string& result) const {

    std::string hasBuffer = hasBufferOrSidebandStream() ? " (contains buffer)" : "";

    StringAppendF(&result, "Layer %s%s pid:%d uid:%d\n", getName().c_str(), hasBuffer.c_str(),

                  mOwnerPid, mOwnerUid);

}

services/surfaceflinger/Layer.h

+1 −1
Original line number Diff line number Diff line
@@ -634,7 +634,7 @@ public: 


    void miniDump(std::string& result, const DisplayDevice&) const;

    void dumpFrameStats(std::string& result) const;

    void dumpCallingUidPid(std::string& result) const;

    void dumpOffscreenDebugInfo(std::string& result) const;

    void clearFrameStats();

    void logFrameStats();

    void getFrameStats(FrameStats* outStats) const;

services/surfaceflinger/SurfaceFlinger.cpp

+1 −1
Original line number Diff line number Diff line
@@ -5219,7 +5219,7 @@ void SurfaceFlinger::dumpOffscreenLayers(std::string& result) { 
        std::string result;

        for (Layer* offscreenLayer : mOffscreenLayers) {

            offscreenLayer->traverse(LayerVector::StateSet::Drawing,

                                     [&](Layer* layer) { layer->dumpCallingUidPid(result); });

                                     [&](Layer* layer) { layer->dumpOffscreenDebugInfo(result); });

        }

        return result;

    });