summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author James Dong <jdong@google.com> 2010-09-10 11:34:15 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-09-10 11:34:15 -0700
commitc18c02d78c0d9ec422f35aac2680022096c8c7cf (patch)
tree6ff66f3d257ffb1b3bd10378dd0f197bb441418a
parentdd88d7e3ffdd8fa79bbc31dbfe4d29c631b60a6b (diff)
parent2432248b03c675812dbb2154e2535bf3ada54b0a (diff)
am 2432248b: am 4709c7fa: Merge "Fixed a copy and paste error" into gingerbread
Merge commit '2432248b03c675812dbb2154e2535bf3ada54b0a' * commit '2432248b03c675812dbb2154e2535bf3ada54b0a': Fixed a copy and paste error
-rw-r--r--media/jni/android_media_MediaRecorder.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/jni/android_media_MediaRecorder.cpp b/media/jni/android_media_MediaRecorder.cpp
index 24fe2dbc1264..82b4ac1c9838 100644
--- a/media/jni/android_media_MediaRecorder.cpp
+++ b/media/jni/android_media_MediaRecorder.cpp
@@ -451,7 +451,7 @@ android_media_MediaRecorder_native_setup(JNIEnv *env, jobject thiz, jobject weak
return;
}
if (mr->initCheck() != NO_ERROR) {
- jniThrowException(env, "java/lang/IOException", "Unable to initialize camera");
+ jniThrowException(env, "java/lang/RuntimeException", "Unable to initialize media recorder");
return;
}