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

Merge "Don't crash if the MediaCodecList is null." am: f80c56df73 am: ac569866d9

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556749

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9ef5f798a545f21752b56d6a3134f3179d323734
This commit is contained in:
Treehugger Robot
2021-03-05 18:08:04 +00:00
committed by Automerger Merge Worker
parent 485249abd1 ac569866d9
commit e0c584e656
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
media/jni/android_media_MediaCodecList.cpp
View File

@@ -105,6 +105,7 @@ static const JavaMediaCodecListWrapper *getCodecList(JNIEnv *env) {
// This should never happen unless something is really wrong // This should never happen unless something is really wrong
jniThrowException( jniThrowException(
env, "java/lang/RuntimeException", "cannot get MediaCodecList"); env, "java/lang/RuntimeException", "cannot get MediaCodecList");
return NULL;
} }
sListWrapper.reset(new JavaMediaCodecListWrapper(mcl)); sListWrapper.reset(new JavaMediaCodecListWrapper(mcl));