Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix exception checking after native prepare call" into udc-dev

Browse Source
This commit is contained in:
Vlad Popa
2023-04-26 14:08:31 +00:00
committed by Android (Google) Code Review
parent d8c71e5d75 33ae2f6d60
commit 3a2bda18c4
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
media/jni/android_media_MediaPlayer.cpp
View File

@@ -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." );
if (env->ExceptionCheck()) {
return UNKNOWN_ERROR;
}
// update the piid
Parcel *request = parcelForJavaObject(env, piidParcel);
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." );
if (env->ExceptionCheck()) {
return UNKNOWN_ERROR;
}
// update the piid
Parcel *request = parcelForJavaObject(env, piidParcel);
auto reply = std::make_unique<Parcel>();