summaryrefslogtreecommitdiffstats
path: root/media/jni
diff options
context:
space:
mode:
authorChien-Yu Chen <cychen@google.com>2015-06-18 11:55:18 -0700
committerChien-Yu Chen <cychen@google.com>2015-06-18 11:55:18 -0700
commit0375cb042d54a6d7c93795b4d117b138f02bd1e0 (patch)
tree1fc43b797e45e39206a9cb23a002fe4d12b976fc /media/jni
parent98b40aac8399d8befc5099955a34ce54df477d8f (diff)
downloadframeworks_base-0375cb042d54a6d7c93795b4d117b138f02bd1e0.zip
frameworks_base-0375cb042d54a6d7c93795b4d117b138f02bd1e0.tar.gz
frameworks_base-0375cb042d54a6d7c93795b4d117b138f02bd1e0.tar.bz2
ImageWriter: Remove exception for closing twice
because close() will be called again when GC kicks in. Bug: 20945169 Change-Id: If3c5a13be241977ccf4692d5301c423b7ff38918
Diffstat (limited to 'media/jni')
-rw-r--r--media/jni/android_media_ImageWriter.cpp3
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;
}