am 1334a6f3: am 8d47bc97: Merge "Camera: Clarify JNI exception message" into lmp-mr1-dev

* commit '1334a6f34296094baddc0d4c0c93357532b2a96d': Camera: Clarify JNI exception message
2015-01-15 20:13:11 +00:00
parent 34a1a10d51 1334a6f342
commit 31028fa621
1 changed files with 2 additions and 1 deletions
--- 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;