summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Dong <jdong@google.com>2010-09-10 11:21:42 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-09-10 11:21:42 -0700
commit4709c7faaa7d14b136dd3b1d8126f972ee11a1aa (patch)
treeda5639197cf84f66f2c01d5f4336d6037120e376
parent2814ad25578d1a52826464477da16217247c04e0 (diff)
parent8d3b9100a660591cca01f1df801aaf9830b9e3ba (diff)
downloadframeworks_base-4709c7faaa7d14b136dd3b1d8126f972ee11a1aa.zip
frameworks_base-4709c7faaa7d14b136dd3b1d8126f972ee11a1aa.tar.gz
frameworks_base-4709c7faaa7d14b136dd3b1d8126f972ee11a1aa.tar.bz2
Merge "Fixed a copy and paste error" into gingerbread
-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 f69b8ad..efa0813 100644
--- a/media/jni/android_media_MediaRecorder.cpp
+++ b/media/jni/android_media_MediaRecorder.cpp
@@ -437,7 +437,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;
}