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

Commit 2671bb8d authored by android-build-team Robot's avatar android-build-team Robot Committed by android-build-merger
Browse files

Merge "Fix BufferItemConsumer::releaseBuffer error logging" into pi-dev am: 1cfa648d

am: de5854ba

Change-Id: I8645bd9d46ae538267913ba8aadfb167e63f44e4
parents d88a0509 de5854ba
Loading
Loading
Loading
Loading
+4 −1
Original line number Original line Diff line number Diff line
@@ -92,10 +92,13 @@ status_t BufferItemConsumer::releaseBuffer(const BufferItem &item,
    Mutex::Autolock _l(mMutex);
    Mutex::Autolock _l(mMutex);


    err = addReleaseFenceLocked(item.mSlot, item.mGraphicBuffer, releaseFence);
    err = addReleaseFenceLocked(item.mSlot, item.mGraphicBuffer, releaseFence);
    if (err != OK) {
        BI_LOGE("Failed to addReleaseFenceLocked");
    }


    err = releaseBufferLocked(item.mSlot, item.mGraphicBuffer, EGL_NO_DISPLAY,
    err = releaseBufferLocked(item.mSlot, item.mGraphicBuffer, EGL_NO_DISPLAY,
            EGL_NO_SYNC_KHR);
            EGL_NO_SYNC_KHR);
    if (err != OK) {
    if (err != OK && err != IGraphicBufferConsumer::STALE_BUFFER_SLOT) {
        BI_LOGE("Failed to release buffer: %s (%d)",
        BI_LOGE("Failed to release buffer: %s (%d)",
                strerror(-err), err);
                strerror(-err), err);
    }
    }