commit 2671bb8d179ab69b2bf2c01e27ea0ed502eb9955
author android-build-team Robot <android-build-team-robot@google.com> Mon Apr 30 12:57:33 2018 -0700
committer android-build-merger <android-build-merger@google.com> Mon Apr 30 12:57:33 2018 -0700
tree 4c0a80ac92640801742f38f36b5a581c8e1d113f
parent d88a05095b676a74417afe3d70c15ddcf513b59d
parent de5854bac4789e99e26fa6ab6be5ee0b6b5140a0

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

Change-Id: I8645bd9d46ae538267913ba8aadfb167e63f44e4

libs/gui/BufferItemConsumer.cpp

diff --git a/libs/gui/BufferItemConsumer.cpp b/libs/gui/BufferItemConsumer.cpp
index 34e6d80..89bc0c4 100644
--- a/libs/gui/BufferItemConsumer.cpp
+++ b/libs/gui/BufferItemConsumer.cpp
@@ -92,10 +92,13 @@
     Mutex::Autolock _l(mMutex);
 
     err = addReleaseFenceLocked(item.mSlot, item.mGraphicBuffer, releaseFence);
+    if (err != OK) {
+        BI_LOGE("Failed to addReleaseFenceLocked");
+    }
 
     err = releaseBufferLocked(item.mSlot, item.mGraphicBuffer, EGL_NO_DISPLAY,
             EGL_NO_SYNC_KHR);
-    if (err != OK) {
+    if (err != OK && err != IGraphicBufferConsumer::STALE_BUFFER_SLOT) {
         BI_LOGE("Failed to release buffer: %s (%d)",
                 strerror(-err), err);
     }