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

* commit '5901ddeb525ed7691c382e8d17f47055d7d1e5db': Release locked buffer when it fails to acquire graphics buffer
2014-01-31 13:00:35 +00:00
parent dfd1aa4331 5901ddeb52
commit 4f840dd16d
1 changed files with 1 additions and 0 deletions
--- a/media/jni/android_media_ImageReader.cpp
+++ b/media/jni/android_media_ImageReader.cpp
@@ -707,6 +707,7 @@ static jint ImageReader_imageSetup(JNIEnv* env, jobject thiz,
    }
    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;