diff options
| author | Jesse Hall <jessehall@google.com> | 2014-10-02 23:43:31 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-02 23:43:31 +0000 |
| commit | 8619132f167afab3775315acdf6e7097fff41a91 (patch) | |
| tree | 82e833cb658fd8d9d10c57748003a31c6ad535d0 /libs | |
| parent | 754b3c9fe1c6008d42e4be15dbe574cfbc275779 (diff) | |
| parent | 74efd6e6bec8a49f66090a5c0c18b65ba8a6fcad (diff) | |
| download | frameworks_native-8619132f167afab3775315acdf6e7097fff41a91.zip frameworks_native-8619132f167afab3775315acdf6e7097fff41a91.tar.gz frameworks_native-8619132f167afab3775315acdf6e7097fff41a91.tar.bz2 | |
am 74efd6e6: am f05ef4e5: Merge "Surface: cancel the dequeued buffer when requestBuffer fails" into lmp-dev
* commit '74efd6e6bec8a49f66090a5c0c18b65ba8a6fcad':
Surface: cancel the dequeued buffer when requestBuffer fails
Diffstat (limited to 'libs')
| -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 b56030e..0e2baa2 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; } } |