diff options
| author | Zhijun He <zhijunhe@google.com> | 2014-01-30 23:01:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-01-30 23:01:21 +0000 |
| commit | 0a1b64fe79f41eec5cebe8434ab30d93e2ea2724 (patch) | |
| tree | 1de608c558685576c798835e6d7d5d98fe20260f | |
| parent | 3038046b23540ccf4ca80f181386a77cf64d5e27 (diff) | |
| parent | 334778981dc01b5f8f4e137eb3f78745e214cf4d (diff) | |
| download | frameworks_base-0a1b64fe79f41eec5cebe8434ab30d93e2ea2724.zip frameworks_base-0a1b64fe79f41eec5cebe8434ab30d93e2ea2724.tar.gz frameworks_base-0a1b64fe79f41eec5cebe8434ab30d93e2ea2724.tar.bz2 | |
Merge "Release locked buffer when it fails to acquire graphics buffer"
| -rw-r--r-- | media/jni/android_media_ImageReader.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
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 @@ 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; |