diff options
| author | Jesse Hall <jessehall@google.com> | 2014-10-02 23:11:08 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-02 23:11:09 +0000 |
| commit | f05ef4e542c3041379025e16497ff23710de5dbf (patch) | |
| tree | c571bf89a8ee900c0f83a658a1bd9d98133ed890 | |
| parent | 0ba908e7a55ce2641f8886db2a059ccaa3f7a22a (diff) | |
| parent | 9f5a1b6abd5d77923bf5e0f1c5e2816fdee832c2 (diff) | |
| download | native-f05ef4e542c3041379025e16497ff23710de5dbf.tar.gz | |
Merge "Surface: cancel the dequeued buffer when requestBuffer fails" into lmp-dev
| -rw-r--r-- | libs/gui/Surface.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libs/gui/Surface.cpp b/libs/gui/Surface.cpp index b56030e9ea..0e2baa28fd 100644 --- a/libs/gui/Surface.cpp +++ b/libs/gui/Surface.cpp @@ -237,6 +237,7 @@ int Surface::dequeueBuffer(android_native_buffer_t** buffer, int* fenceFd) { result = mGraphicBufferProducer->requestBuffer(buf, &gbuf); if (result != NO_ERROR) { ALOGE("dequeueBuffer: IGraphicBufferProducer::requestBuffer failed: %d", result); + mGraphicBufferProducer->cancelBuffer(buf, fence); return result; } } |