commit 5901ddeb525ed7691c382e8d17f47055d7d1e5db
author Zhijun He <zhijunhe@google.com> Thu Jan 30 15:03:30 2014 -0800
committer Android Git Automerger <android-git-automerger@android.com> Thu Jan 30 15:03:30 2014 -0800
tree b66e60168dbc271b281fdbf22ea07a98b51f9d22
parent 2cd0563cb8345747d3705d4f339a0800998767fe
parent 0a1b64fe79f41eec5cebe8434ab30d93e2ea2724

am 0a1b64fe: Merge "Release locked buffer when it fails to acquire graphics buffer"

* commit '0a1b64fe79f41eec5cebe8434ab30d93e2ea2724':
  Release locked buffer when it fails to acquire graphics buffer

media/jni/android_media_ImageReader.cpp

diff --git a/media/jni/android_media_ImageReader.cpp b/media/jni/android_media_ImageReader.cpp
index 0030dbd..d475eee 100644
--- a/media/jni/android_media_ImageReader.cpp
+++ b/media/jni/android_media_ImageReader.cpp
@@ -707,6 +707,7 @@
     }
     status_t res = consumer->lockNextBuffer(buffer);
     if (res != NO_ERROR) {
+        ctx->returnLockedBuffer(buffer);
         if (res != BAD_VALUE /*no buffers*/) {
             if (res == NOT_ENOUGH_DATA) {
                 return ACQUIRE_MAX_IMAGES;