diff options
| author | Jesse Hall <jessehall@google.com> | 2014-10-02 23:26:58 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-02 23:26:58 +0000 |
| commit | 74efd6e6bec8a49f66090a5c0c18b65ba8a6fcad (patch) | |
| tree | 2b390bc3c92a3226246d12579a10f8b36f03e209 | |
| parent | 167013b2bea340ccf14bf751ef39cc5abef4533a (diff) | |
| parent | f05ef4e542c3041379025e16497ff23710de5dbf (diff) | |
| download | frameworks_native-74efd6e6bec8a49f66090a5c0c18b65ba8a6fcad.tar.gz frameworks_native-74efd6e6bec8a49f66090a5c0c18b65ba8a6fcad.tar.bz2 frameworks_native-74efd6e6bec8a49f66090a5c0c18b65ba8a6fcad.zip | |
am f05ef4e5: Merge "Surface: cancel the dequeued buffer when requestBuffer fails" into lmp-dev
* commit 'f05ef4e542c3041379025e16497ff23710de5dbf':
Surface: cancel the dequeued buffer when requestBuffer fails
| -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 b56030e9e..0e2baa28f 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; } } |