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

Commit 361dcc75 authored by Jamie Gennis's avatar Jamie Gennis Committed by Android (Google) Code Review
Browse files

Merge "Compare GraphicBuffers using handles." into honeycomb

parents bcb3e57e 73e8b9e5

libs/gui/SurfaceTextureClient.cpp

+2 −2
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ int SurfaceTextureClient::cancelBuffer(android_native_buffer_t* buffer) { 
    LOGV("SurfaceTextureClient::cancelBuffer");

    Mutex::Autolock lock(mMutex);

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

        if (mSlots[i].get() == buffer) {

        if (mSlots[i]->handle == buffer->handle) {

            mSurfaceTexture->cancelBuffer(i);

            return OK;

        }
@@ -129,7 +129,7 @@ int SurfaceTextureClient::queueBuffer(android_native_buffer_t* buffer) { 
    LOGV("SurfaceTextureClient::queueBuffer");

    Mutex::Autolock lock(mMutex);

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

        if (mSlots[i].get() == GraphicBuffer::getSelf(buffer)) {

        if (mSlots[i]->handle == buffer->handle) {

            return mSurfaceTexture->queueBuffer(i);

        }

    }