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

Commit 10fd73a2 authored by Android (Google) Code Review's avatar Android (Google) Code Review Committed by The Android Open Source Project
Browse files

am 7f2ae493: Merge change 1370 into donut 

Merge commit '7f2ae493'

* commit '7f2ae493':
  Fix a JNI layer crash due to null camera object passed to get_native_camera()
parents 7a6287a0 7f2ae493

media/jni/android_media_MediaRecorder.cpp

+5 −0
Original line number Diff line number Diff line
@@ -150,6 +150,11 @@ static sp<MediaRecorder> setMediaRecorder(JNIEnv* env, jobject thiz, const sp<Me 


static void android_media_MediaRecorder_setCamera(JNIEnv* env, jobject thiz, jobject camera)

{

    // we should not pass a null camera to get_native_camera() call.

    if (camera == NULL) {

        jniThrowException(env, "java/lang/NullPointerException", "camera object is a NULL pointer");

        return;

    }

    sp<Camera> c = get_native_camera(env, camera, NULL);

    sp<MediaRecorder> mr = getMediaRecorder(env, thiz);

    process_media_recorder_call(env, mr->setCamera(c->remote()),