Commit e0c584e6 authored Mar 05, 2021 by Treehugger Robot Committed by Automerger Merge Worker Mar 05, 2021

Merge "Don't crash if the MediaCodecList is null." am: f80c56df am: ac569866

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9ef5f798a545f21752b56d6a3134f3179d323734

parents 485249ab ac569866

media/jni/android_media_MediaCodecList.cpp

+1 −0

Original line number	Diff line number	Diff line
		@@ -105,6 +105,7 @@ static const JavaMediaCodecListWrapper getCodecList(JNIEnv env) {
		// This should never happen unless something is really wrong
		jniThrowException(
		env, "java/lang/RuntimeException", "cannot get MediaCodecList");
		return NULL;
		}

		sListWrapper.reset(new JavaMediaCodecListWrapper(mcl));