commit 0e337d91754c1db7f795d466feb43d438d95ef0e
author Eino-Ville Talvala <etalvala@google.com> Mon Jan 12 17:01:11 2015 -0800
committer The Android Automerger <android-build@google.com> Thu Jan 15 14:49:56 2015 -0800
tree ef7c0a5a414aa5a47ba521b1fa63cfec85bea7b9
parent c4f9e4cd244b1db8bc38ae592eb852da08baef4c

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

core/jni/android_hardware_Camera.cpp

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 @@
     }
     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;