OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1f1416e
)
JNI ImageReader: propagate exceptions when creating surface planes
author
Robert Shih
<robertshih@google.com>
Thu, 9 Mar 2017 20:40:09 +0000
(12:40 -0800)
committer
Robert Shih
<robertshih@google.com>
Fri, 10 Mar 2017 18:18:00 +0000
(18:18 +0000)
Bug:
36082388
Test: Manual
Change-Id: I4a0ad08c9b3c53aa7ca702e1c6e2d486b788f3ff
media/jni/android_media_ImageReader.cpp
patch
|
blob
|
history
diff --git
a/media/jni/android_media_ImageReader.cpp
b/media/jni/android_media_ImageReader.cpp
index
b00f5a5
..
f5e19f9
100644
(file)
--- 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,