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

Commit 85a315b5 authored by Pannag Sanketi's avatar Pannag Sanketi Committed by Android (Google) Code Review
Browse files

Merge "Fixing up Mediarecorder for MFF"

parents efebb49c cac873bd

media/java/android/media/MediaRecorder.java

+2 −0
Original line number Diff line number Diff line
@@ -176,6 +176,8 @@ public class MediaRecorder 
        public static final int DEFAULT = 0;

        /** Camera video source */

        public static final int CAMERA = 1;

        /** @hide */

        public static final int GRALLOC_BUFFER = 2;

    }



    /**

media/jni/android_media_MediaRecorder.cpp

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ static bool process_media_recorder_call(JNIEnv *env, status_t opStatus, const ch 
    return false;

}



sp<MediaRecorder> getMediaRecorder(JNIEnv* env, jobject thiz)

static sp<MediaRecorder> getMediaRecorder(JNIEnv* env, jobject thiz)

{

    Mutex::Autolock l(sLock);

    MediaRecorder* const p = (MediaRecorder*)env->GetIntField(thiz, fields.context);