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

Commit 795b47fb authored by Dongwon Kang's avatar Dongwon Kang Committed by android-build-merger
Browse files

Merge "Merge "MediaPlayer: ensure that jni code returns after throwing... 

Merge "Merge "MediaPlayer: ensure that jni code returns after throwing exceptions." into pi-dev am: 1a9def3d" into pi-dev-plus-aosp
am: 42542ca0

Change-Id: I2c892282a2aee6b03395b1c61ebae19df8c4397c
parents 61ba752f 42542ca0

media/jni/android_media_MediaPlayer.cpp

+9 −0
Original line number Diff line number Diff line
@@ -384,6 +384,9 @@ android_media_MediaPlayer_getBufferingParams(JNIEnv *env, jobject thiz) 
    process_media_player_call(

            env, thiz, mp->getBufferingSettings(&settings),

            "java/lang/IllegalStateException", "unexpected error");

    if (env->ExceptionCheck()) {

        return nullptr;

    }

    ALOGV("getBufferingSettings:{%s}", settings.toString().string());



    return bp.asJobject(env, gBufferingParamsFields);
@@ -555,6 +558,9 @@ android_media_MediaPlayer_getPlaybackParams(JNIEnv *env, jobject thiz) 
    process_media_player_call(

            env, thiz, mp->getPlaybackSettings(&audioRate),

            "java/lang/IllegalStateException", "unexpected error");

    if (env->ExceptionCheck()) {

        return nullptr;

    }

    ALOGV("getPlaybackSettings: %f %f %d %d",

            audioRate.mSpeed, audioRate.mPitch, audioRate.mFallbackMode, audioRate.mStretchMode);
@@ -623,6 +629,9 @@ android_media_MediaPlayer_getSyncParams(JNIEnv *env, jobject thiz) 
    process_media_player_call(

            env, thiz, mp->getSyncSettings(&scp.sync, &scp.frameRate),

            "java/lang/IllegalStateException", "unexpected error");

    if (env->ExceptionCheck()) {

        return nullptr;

    }



    ALOGV("getSyncSettings: %d %d %f %f",

            scp.sync.mSource, scp.sync.mAudioAdjustMode, scp.sync.mTolerance, scp.frameRate);

media/jni/android_media_MediaPlayer2.cpp

+9 −0
Original line number Diff line number Diff line
@@ -495,6 +495,9 @@ android_media_MediaPlayer2_getBufferingParams(JNIEnv *env, jobject thiz) 
    process_media_player_call(

            env, thiz, mp->getBufferingSettings(&settings),

            "java/lang/IllegalStateException", "unexpected error");

    if (env->ExceptionCheck()) {

        return nullptr;

    }

    ALOGV("getBufferingSettings:{%s}", settings.toString().string());



    return bp.asJobject(env, gBufferingParamsFields);
@@ -662,6 +665,9 @@ android_media_MediaPlayer2_getPlaybackParams(JNIEnv *env, jobject thiz) 
    process_media_player_call(

            env, thiz, mp->getPlaybackSettings(&audioRate),

            "java/lang/IllegalStateException", "unexpected error");

    if (env->ExceptionCheck()) {

        return nullptr;

    }

    ALOGV("getPlaybackSettings: %f %f %d %d",

            audioRate.mSpeed, audioRate.mPitch, audioRate.mFallbackMode, audioRate.mStretchMode);
@@ -730,6 +736,9 @@ android_media_MediaPlayer2_getSyncParams(JNIEnv *env, jobject thiz) 
    process_media_player_call(

            env, thiz, mp->getSyncSettings(&scp.sync, &scp.frameRate),

            "java/lang/IllegalStateException", "unexpected error");

    if (env->ExceptionCheck()) {

        return nullptr;

    }



    ALOGV("getSyncSettings: %d %d %f %f",

            scp.sync.mSource, scp.sync.mAudioAdjustMode, scp.sync.mTolerance, scp.frameRate);