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

Commit a5a18424 authored by Pablo Ceballos's avatar Pablo Ceballos Committed by android-build-merger
Browse files

Merge "BQ: Fix segfault in dump()" into nyc-dev 

am: ed2c5d19

* commit 'ed2c5d19':
  BQ: Fix segfault in dump()

Change-Id: If9d49120eca9624c99e1bfbcdbd55052698a8633
parents ed8b613f ed2c5d19

libs/gui/BufferQueueCore.cpp

+12 −5
Original line number Diff line number Diff line
@@ -130,11 +130,18 @@ void BufferQueueCore::dump(String8& result, const char* prefix) const { 


    for (int s : mActiveBuffers) {

        const sp<GraphicBuffer>& buffer(mSlots[s].mGraphicBuffer);

        result.appendFormat("%s%s[%02d:%p] state=%-8s, %p [%4ux%4u:%4u,%3X]\n",

                prefix, (mSlots[s].mBufferState.isAcquired()) ? ">" : " ", s,

                buffer.get(), mSlots[s].mBufferState.string(), buffer->handle,

                buffer->width, buffer->height, buffer->stride, buffer->format);



        // A dequeued buffer might be null if it's still being allocated

        if (buffer.get()) {

            result.appendFormat("%s%s[%02d:%p] state=%-8s, %p "

                    "[%4ux%4u:%4u,%3X]\n", prefix,

                    (mSlots[s].mBufferState.isAcquired()) ? ">" : " ", s,

                    buffer.get(), mSlots[s].mBufferState.string(),

                    buffer->handle, buffer->width, buffer->height,

                    buffer->stride, buffer->format);

        } else {

            result.appendFormat("%s [%02d:%p] state=%-8s\n", prefix, s,

                    buffer.get(), mSlots[s].mBufferState.string());

        }

    }

    for (int s : mFreeBuffers) {

        const sp<GraphicBuffer>& buffer(mSlots[s].mGraphicBuffer);