diff options
author | Wu-cheng Li <wuchengli@google.com> | 2009-06-10 16:55:39 +0800 |
---|---|---|
committer | Wu-cheng Li <wuchengli@google.com> | 2009-06-10 17:17:31 +0800 |
commit | ba55b3654b3eb4b9ab340b4635c4400a4c66237c (patch) | |
tree | 4f1adeae6dc8a71bd04d6c234ca932fc6c33f09d /core/jni/android_hardware_Camera.cpp | |
parent | 0e1ca5749a96778869ef62f939542a61c034209b (diff) | |
download | frameworks_base-ba55b3654b3eb4b9ab340b4635c4400a4c66237c.zip frameworks_base-ba55b3654b3eb4b9ab340b4635c4400a4c66237c.tar.gz frameworks_base-ba55b3654b3eb4b9ab340b4635c4400a4c66237c.tar.bz2 |
Change exceptions to RuntimeException.
This is to follow hardware/Cmaera.java because those exceptiones are not declared to be thrown.
Diffstat (limited to 'core/jni/android_hardware_Camera.cpp')
-rw-r--r-- | core/jni/android_hardware_Camera.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/core/jni/android_hardware_Camera.cpp b/core/jni/android_hardware_Camera.cpp index c107993..9b92bc5 100644 --- a/core/jni/android_hardware_Camera.cpp +++ b/core/jni/android_hardware_Camera.cpp @@ -115,15 +115,13 @@ static void android_hardware_Camera_native_setup(JNIEnv *env, jobject thiz, jobj // make sure camera hardware is alive if (camera->getStatus() != NO_ERROR) { - jniThrowException(env, "java/io/IOException", "Camera initialization failed"); + jniThrowException(env, "java/lang/RuntimeException", "Camera initialization failed"); return; } jclass clazz = env->GetObjectClass(thiz); if (clazz == NULL) { - LOGE("Can't find android/hardware/Camera"); - // XXX no idea what to throw here, can this even happen? - jniThrowException(env, "java/lang/Exception", NULL); + jniThrowException(env, "java/lang/RuntimeException", "Can't find android/hardware/Camera"); return; } @@ -241,7 +239,7 @@ static void android_hardware_Camera_startPreview(JNIEnv *env, jobject thiz) if (camera == 0) return; if (camera->startPreview() != NO_ERROR) { - jniThrowException(env, "java/io/IOException", "startPreview failed"); + jniThrowException(env, "java/lang/RuntimeException", "startPreview failed"); return; } } @@ -305,7 +303,7 @@ static void android_hardware_Camera_autoFocus(JNIEnv *env, jobject thiz) c->setAutoFocusCallback(autofocus_callback_impl, context); if (c->autoFocus() != NO_ERROR) { - jniThrowException(env, "java/io/IOException", "autoFocus failed"); + jniThrowException(env, "java/lang/RuntimeException", "autoFocus failed"); } } @@ -398,7 +396,7 @@ static void android_hardware_Camera_takePicture(JNIEnv *env, jobject thiz) camera->setRawCallback(raw_callback, context); camera->setJpegCallback(jpeg_callback, context); if (camera->takePicture() != NO_ERROR) { - jniThrowException(env, "java/io/IOException", "takePicture failed"); + jniThrowException(env, "java/lang/RuntimeException", "takePicture failed"); return; } @@ -418,7 +416,7 @@ static void android_hardware_Camera_setParameters(JNIEnv *env, jobject thiz, jst env->ReleaseStringCritical(params, str); } if (camera->setParameters(params8) != NO_ERROR) { - jniThrowException(env, "java/lang/IllegalArgumentException", "setParameters failed"); + jniThrowException(env, "java/lang/RuntimeException", "setParameters failed"); return; } } |