From d790c6485a388a3e8045dbd18b903b20a7dcf0d9 Mon Sep 17 00:00:00 2001 From: James Dong Date: Thu, 12 Aug 2010 10:18:01 -0700 Subject: Add lost preview surface detection in the JNI layer Throws an IOException if this happens rather than crashes Change-Id: I32bb4c889ae596f992a0d05283c9130a99b2d0d5 --- media/jni/android_media_MediaRecorder.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/media/jni/android_media_MediaRecorder.cpp b/media/jni/android_media_MediaRecorder.cpp index c113ffe..f69b8ad 100644 --- a/media/jni/android_media_MediaRecorder.cpp +++ b/media/jni/android_media_MediaRecorder.cpp @@ -318,6 +318,15 @@ android_media_MediaRecorder_prepare(JNIEnv *env, jobject thiz) jobject surface = env->GetObjectField(thiz, fields.surface); if (surface != NULL) { const sp native_surface = get_surface(env, surface); + + // The application may misbehave and + // the preview surface becomes unavailable + if (native_surface.get() == 0) { + LOGE("Application lost the surface"); + jniThrowException(env, "java/io/IOException", "invalid preview surface"); + return; + } + LOGI("prepare: surface=%p (identity=%d)", native_surface.get(), native_surface->getIdentity()); if (process_media_recorder_call(env, mr->setPreviewSurface(native_surface), "java/lang/RuntimeException", "setPreviewSurface failed.")) { return; -- cgit v1.1