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

Commit 8790015b authored by Vlad Popa's avatar Vlad Popa Committed by Automerger Merge Worker
Browse files

Merge "Fix exception checking after native prepare call" into udc-dev am: 3a2bda18 am: 910b8acc 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22849700



Change-Id: I1f5470502000b7ddb530c0063922b66d4013a15d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0f2e65a4 910b8acc

media/jni/android_media_MediaPlayer.cpp

+8 −0
Original line number Original line Diff line number Diff line
@@ -385,6 +385,10 @@ android_media_MediaPlayer_prepare(JNIEnv *env, jobject thiz, jobject piidParcel) 




    process_media_player_call( env, thiz, mp->prepare(), "java/io/IOException", "Prepare failed." );

    process_media_player_call( env, thiz, mp->prepare(), "java/io/IOException", "Prepare failed." );





    if (env->ExceptionCheck()) {

        return UNKNOWN_ERROR;

    }



    // update the piid

    // update the piid

    Parcel *request = parcelForJavaObject(env, piidParcel);

    Parcel *request = parcelForJavaObject(env, piidParcel);

    auto reply = std::make_unique<Parcel>();

    auto reply = std::make_unique<Parcel>();
@@ -407,6 +411,10 @@ android_media_MediaPlayer_prepareAsync(JNIEnv *env, jobject thiz, jobject piidPa 




    process_media_player_call( env, thiz, mp->prepareAsync(), "java/io/IOException", "Prepare Async failed." );

    process_media_player_call( env, thiz, mp->prepareAsync(), "java/io/IOException", "Prepare Async failed." );





    if (env->ExceptionCheck()) {

        return UNKNOWN_ERROR;

    }



    // update the piid

    // update the piid

    Parcel *request = parcelForJavaObject(env, piidParcel);

    Parcel *request = parcelForJavaObject(env, piidParcel);

    auto reply = std::make_unique<Parcel>();

    auto reply = std::make_unique<Parcel>();