Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 31028fa6 authored by Eino-Ville Talvala's avatar Eino-Ville Talvala Committed by Android Git Automerger
Browse files

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

* commit '1334a6f3':
  Camera: Clarify JNI exception message
parents 34a1a10d 1334a6f3

core/jni/android_hardware_Camera.cpp

+2 −1
Original line number Diff line number Diff line
@@ -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;