diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2015-01-15 20:00:01 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-01-15 20:00:02 +0000 |
| commit | 8d47bc97e642cd0d0caf31d09efe05d8dc233f27 (patch) | |
| tree | 5a318dd911f48476188fd48fcb37906b6bef9e63 | |
| parent | e184b2f2355e572fa67e748e625e4eea0ac29201 (diff) | |
| parent | f9133347492a662a89f2aeaf977b60a048d2b647 (diff) | |
| download | frameworks_base-8d47bc97e642cd0d0caf31d09efe05d8dc233f27.zip frameworks_base-8d47bc97e642cd0d0caf31d09efe05d8dc233f27.tar.gz frameworks_base-8d47bc97e642cd0d0caf31d09efe05d8dc233f27.tar.bz2 | |
Merge "Camera: Clarify JNI exception message" into lmp-mr1-dev
| -rw-r--r-- | core/jni/android_hardware_Camera.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/jni/android_hardware_Camera.cpp b/core/jni/android_hardware_Camera.cpp index 4cff56d..69f46d3 100644 --- a/core/jni/android_hardware_Camera.cpp +++ b/core/jni/android_hardware_Camera.cpp @@ -133,7 +133,8 @@ sp<Camera> get_native_camera(JNIEnv *env, jobject thiz, JNICameraContext** pCont } ALOGV("get_native_camera: context=%p, camera=%p", context, camera.get()); if (camera == 0) { - jniThrowRuntimeException(env, "Method called after release()"); + jniThrowRuntimeException(env, + "Camera is being used after Camera.release() was called"); } if (pContext != NULL) *pContext = context; |