drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '0a1b64fe79f41eec5cebe8434ab30d93e2ea2724':
  Release locked buffer when it fails to acquire graphics buffer
This commit is contained in:
Zhijun He
2014-01-30 15:03:30 -08:00
committed by Android Git Automerger
parent 2cd0563cb8 0a1b64fe79
commit 5901ddeb52
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
media/jni/android_media_ImageReader.cpp
View File

@ -707,6 +707,7 @@ static jint ImageReader_imageSetup(JNIEnv* env, jobject thiz,
} }
status_t res = consumer->lockNextBuffer(buffer); status_t res = consumer->lockNextBuffer(buffer);
if (res != NO_ERROR) { if (res != NO_ERROR) {
ctx->returnLockedBuffer(buffer);
if (res != BAD_VALUE /*no buffers*/) { if (res != BAD_VALUE /*no buffers*/) {
if (res == NOT_ENOUGH_DATA) { if (res == NOT_ENOUGH_DATA) {
return ACQUIRE_MAX_IMAGES; return ACQUIRE_MAX_IMAGES;