diff options
| author | Robert Shih <robertshih@google.com> | 2017-03-09 12:40:09 -0800 |
|---|---|---|
| committer | Robert Shih <robertshih@google.com> | 2017-03-10 18:18:00 +0000 |
| commit | 252f3b20bb158ddde6ffa687eff9c4d070919091 (patch) | |
| tree | 4ac0600f7c9c6d1fe2cfcca86039b38ad1ef55dc /media/jni/android_media_ImageReader.cpp | |
| parent | 1f1416e51ae676af1a7f2a7a7151be12762b13d4 (diff) | |
JNI ImageReader: propagate exceptions when creating surface planes
Bug: 36082388
Test: Manual
Change-Id: I4a0ad08c9b3c53aa7ca702e1c6e2d486b788f3ff
Diffstat (limited to 'media/jni/android_media_ImageReader.cpp')
| -rw-r--r-- | media/jni/android_media_ImageReader.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/media/jni/android_media_ImageReader.cpp b/media/jni/android_media_ImageReader.cpp index b00f5a503850..f5e19f908d71 100644 --- a/media/jni/android_media_ImageReader.cpp +++ b/media/jni/android_media_ImageReader.cpp @@ -722,6 +722,9 @@ static jobjectArray Image_createSurfacePlanes(JNIEnv* env, jobject thiz, LockedImage lockedImg = LockedImage(); Image_getLockedImage(env, thiz, &lockedImg); + if (env->ExceptionCheck()) { + return NULL; + } // Create all SurfacePlanes for (int i = 0; i < numPlanes; i++) { Image_getLockedImageInfo(env, &lockedImg, i, halReaderFormat, |