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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6ef505c00d87f48c5af36d37a9570906d559889b

media/jni/android_media_MediaCodecList.cpp

@@ -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));