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
This commit is contained in:
Zhijun He
2014-01-30 15:03:30 -08:00
committed by Android Git Automerger

View File

@ -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;