Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Camera: Clarify JNI exception message" into lmp-mr1-dev

Browse Source
This commit is contained in:
Eino-Ville Talvala
2015-01-15 20:00:01 +00:00
committed by Android (Google) Code Review
parent e184b2f235 f913334749
commit 8d47bc97e6
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/jni/android_hardware_Camera.cpp
View File

@@ -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()); ALOGV("get_native_camera: context=%p, camera=%p", context, camera.get());
if (camera == 0) { 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; if (pContext != NULL) *pContext = context;