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

Commit 178e86bb authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add SF trace to bugreport"

parents c6a1d409 8e7dc72c

services/surfaceflinger/SurfaceFlinger.cpp

+8 −0
Original line number Diff line number Diff line
@@ -4398,6 +4398,14 @@ status_t SurfaceFlinger::doDump(int fd, const DumpArgs& args, 
    return NO_ERROR;

}



status_t SurfaceFlinger::dumpCritical(int fd, const DumpArgs&, bool asProto) {

    if (asProto && mTracing.isEnabled()) {

        mTracing.writeToFileAsync();

    }



    return doDump(fd, DumpArgs(), asProto);

}



void SurfaceFlinger::listLayersLocked(std::string& result) const {

    mCurrentState.traverseInZOrder(

            [&](Layer* layer) { StringAppendF(&result, "%s\n", layer->getName().string()); });

services/surfaceflinger/SurfaceFlinger.h

+1 −3
Original line number Diff line number Diff line
@@ -905,9 +905,7 @@ private: 


    status_t doDump(int fd, const DumpArgs& args, bool asProto);



    status_t dumpCritical(int fd, const DumpArgs&, bool asProto) override {

        return doDump(fd, DumpArgs(), asProto);

    }

    status_t dumpCritical(int fd, const DumpArgs&, bool asProto);



    status_t dumpAll(int fd, const DumpArgs& args, bool asProto) override {

        return doDump(fd, args, asProto);