diff options
| author | Chien-Yu Chen <cychen@google.com> | 2015-06-18 20:42:19 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-18 20:42:21 +0000 |
| commit | aca98de43368a68d1d47c205d8ec8395d4b81376 (patch) | |
| tree | 63931f42a059bca4cc2912bc1291ed619e4bd56d /media | |
| parent | 50ec9b1bd97a04a001dd394885db0cc6f13bea39 (diff) | |
| parent | 0375cb042d54a6d7c93795b4d117b138f02bd1e0 (diff) | |
| download | frameworks_base-aca98de43368a68d1d47c205d8ec8395d4b81376.zip frameworks_base-aca98de43368a68d1d47c205d8ec8395d4b81376.tar.gz frameworks_base-aca98de43368a68d1d47c205d8ec8395d4b81376.tar.bz2 | |
Merge "ImageWriter: Remove exception for closing twice" into mnc-dev
Diffstat (limited to 'media')
| -rw-r--r-- | media/jni/android_media_ImageWriter.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/media/jni/android_media_ImageWriter.cpp b/media/jni/android_media_ImageWriter.cpp index 634ba64..ba7634c 100644 --- a/media/jni/android_media_ImageWriter.cpp +++ b/media/jni/android_media_ImageWriter.cpp @@ -361,8 +361,7 @@ static void ImageWriter_close(JNIEnv* env, jobject thiz, jlong nativeCtx) { ALOGV("%s:", __FUNCTION__); JNIImageWriterContext* const ctx = reinterpret_cast<JNIImageWriterContext *>(nativeCtx); if (ctx == NULL || thiz == NULL) { - jniThrowException(env, "java/lang/IllegalStateException", - "ImageWriterContext is not initialized"); + // ImageWriter is already closed. return; } |