summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEino-Ville Talvala <etalvala@google.com>2015-01-12 17:01:11 -0800
committerEino-Ville Talvala <etalvala@google.com>2015-01-12 17:02:03 -0800
commitf9133347492a662a89f2aeaf977b60a048d2b647 (patch)
tree9f6cb6b3bd1ce8439e8ef6459348d5882b73d656
parent9a19ed17e1f36894aac8250dcf9649998d9c2603 (diff)
downloadframeworks_base-f9133347492a662a89f2aeaf977b60a048d2b647.zip
frameworks_base-f9133347492a662a89f2aeaf977b60a048d2b647.tar.gz
frameworks_base-f9133347492a662a89f2aeaf977b60a048d2b647.tar.bz2
Camera: Clarify JNI exception message
This exception may be generated through MediaRecorder method calls as well, so clarify that the issue is an invalid camera object. Bug: 18414095 Change-Id: I189ab1a71ab0d6a432b87c45a82c90fe11d22ef8
-rw-r--r--core/jni/android_hardware_Camera.cpp3
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;