diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2015-01-15 20:06:34 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-15 20:06:34 +0000 |
| commit | 1334a6f34296094baddc0d4c0c93357532b2a96d (patch) | |
| tree | 3c92c107bb30103802f579d0d9c5e1245edc6869 | |
| parent | b47cf562bbbc08e45a6ae38e1ae98a36e6928caf (diff) | |
| parent | 8d47bc97e642cd0d0caf31d09efe05d8dc233f27 (diff) | |
| download | frameworks_base-1334a6f34296094baddc0d4c0c93357532b2a96d.zip frameworks_base-1334a6f34296094baddc0d4c0c93357532b2a96d.tar.gz frameworks_base-1334a6f34296094baddc0d4c0c93357532b2a96d.tar.bz2 | |
am 8d47bc97: Merge "Camera: Clarify JNI exception message" into lmp-mr1-dev
* commit '8d47bc97e642cd0d0caf31d09efe05d8dc233f27':
Camera: Clarify JNI exception message
| -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; |