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

Commit af08d8ab authored by Mathias Agopian's avatar Mathias Agopian Committed by Android (Google) Code Review
Browse files

Merge "improve dumpsys SurfaceFlinger output"

parents c109b61f ad795bae

libs/gui/SurfaceTexture.cpp

+8 −3
Original line number Diff line number Diff line
@@ -981,10 +981,15 @@ void SurfaceTexture::dump(String8& result, const char* prefix, 


    for (int i=0 ; i<mBufferCount ; i++) {

        const BufferSlot& slot(mSlots[i]);

        const sp<GraphicBuffer>& buf(slot.mGraphicBuffer);

        snprintf(buffer, SIZE,

                "%s%s[%02d] state=%-8s, crop=[%d,%d,%d,%d], transform=0x%02x, "

                "timestamp=%lld\n",

                prefix, (i==mCurrentTexture)?">":" ", i, stateName(slot.mBufferState),

                "%s%s[%02d] "

                "%p [%4ux%4u:%4u,%3X] "

                "state=%-8s, crop=[%d,%d,%d,%d], "

                "transform=0x%02x, timestamp=%lld\n",

                prefix, (i==mCurrentTexture)?">":" ", i,

                buf->handle, buf->width, buf->height, buf->stride, buf->format,

                stateName(slot.mBufferState),

                slot.mCrop.left, slot.mCrop.top, slot.mCrop.right, slot.mCrop.bottom,

                slot.mTransform, slot.mTimestamp

        );

services/surfaceflinger/Layer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -533,7 +533,7 @@ void Layer::dump(String8& result, char* buffer, size_t SIZE) const 
    }

    snprintf(buffer, SIZE,

            "      "

            "format=%2d, activeBuffer=[%3ux%3u:%3u,%3u],"

            "format=%2d, activeBuffer=[%4ux%4u:%4u,%3X],"

            " freezeLock=%p, queued-frames=%d\n",

            mFormat, w0, h0, s0,f0,

            getFreezeLock().get(), mQueuedFrames);