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

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

Merge "[3171580] don't automatically log GraphicBuffer allocation failures" into gingerbread

parents 3846f7a9 678bdd63

include/ui/GraphicBuffer.h

+4 −1
Original line number Diff line number Diff line
@@ -94,6 +94,9 @@ public: 
    void setIndex(int index);

    int getIndex() const;



    // for debugging

    static void dumpAllocationsToSystemLog();



private:

    virtual ~GraphicBuffer();

include/ui/GraphicBufferAllocator.h

+1 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ public: 
    status_t free(buffer_handle_t handle);



    void dump(String8& res) const;

    static void dumpToSystemLog();



private:

    struct alloc_rec_t {

libs/ui/GraphicBuffer.cpp

+5 −0
Original line number Diff line number Diff line
@@ -99,6 +99,11 @@ status_t GraphicBuffer::initCheck() const { 
    return mInitCheck;

}



void GraphicBuffer::dumpAllocationsToSystemLog()

{

    GraphicBufferAllocator::dumpToSystemLog();

}



android_native_buffer_t* GraphicBuffer::getNativeBuffer() const

{

    return static_cast<android_native_buffer_t*>(

libs/ui/GraphicBufferAllocator.cpp

+7 −4
Original line number Diff line number Diff line
@@ -73,6 +73,13 @@ void GraphicBufferAllocator::dump(String8& result) const 
    result.append(buffer);

}



void GraphicBufferAllocator::dumpToSystemLog()

{

    String8 s;

    GraphicBufferAllocator::getInstance().dump(s);

    LOGD("%s", s.string());

}



status_t GraphicBufferAllocator::alloc(uint32_t w, uint32_t h, PixelFormat format,

        int usage, buffer_handle_t* handle, int32_t* stride)

{
@@ -104,10 +111,6 @@ status_t GraphicBufferAllocator::alloc(uint32_t w, uint32_t h, PixelFormat forma 
        rec.usage = usage;

        rec.size = h * stride[0] * bytesPerPixel(format);

        list.add(*handle, rec);

    } else {

        String8 s;

        dump(s);

        LOGD("%s", s.string());

    }



    return err;

services/surfaceflinger/Layer.cpp

+1 −0
Original line number Diff line number Diff line
@@ -347,6 +347,7 @@ sp<GraphicBuffer> Layer::requestBuffer(int index, 
    err = buffer->initCheck();



    if (err || buffer->handle == 0) {

        GraphicBuffer::dumpAllocationsToSystemLog();

        LOGE_IF(err || buffer->handle == 0,

                "Layer::requestBuffer(this=%p), index=%d, w=%d, h=%d failed (%s)",

                this, index, w, h, strerror(-err));