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

Commit 12273862 authored by Lajos Molnar's avatar Lajos Molnar Committed by android-build-merger
Browse files

Merge "media: avoid NPE in CodecCapabilities.createFromProfileLevel" into nyc-dev 

am: 9061b26f

* commit '9061b26f':
  media: avoid NPE in CodecCapabilities.createFromProfileLevel

Change-Id: I3cd969d6e686714cd7d9fa49eec70e9d810df36b
parents cc80f0a9 9061b26f

media/java/android/media/MediaCodecInfo.java

+3 −0
Original line number Diff line number Diff line
@@ -750,6 +750,9 @@ public final class MediaCodecInfo { 
         * Retrieve the codec capabilities for a certain {@code mime type}, {@code

         * profile} and {@code level}.  If the type, or profile-level combination

         * is not understood by the framework, it returns null.

         * <p class=note> In {@link android.os.Build.VERSION_CODES#M}, calling this

         * method without calling any method of the {@link MediaCodecList} class beforehand

         * results in a {@link NullPointerException}.</p>

         */

        public static CodecCapabilities createFromProfileLevel(

                String mime, int profile, int level) {

media/java/android/media/MediaCodecList.java

+5 −1
Original line number Diff line number Diff line
@@ -63,6 +63,11 @@ final public class MediaCodecList { 
    }



    /* package private */ static final Map<String, Object> getGlobalSettings() {

        synchronized (sInitLock) {

            if (sGlobalSettings == null) {

                sGlobalSettings = native_getGlobalSettings();

            }

        }

        return sGlobalSettings;

    }
@@ -74,7 +79,6 @@ final public class MediaCodecList { 
    private static final void initCodecList() {

        synchronized (sInitLock) {

            if (sRegularCodecInfos == null) {

                sGlobalSettings = native_getGlobalSettings();

                int count = native_getCodecCount();

                ArrayList<MediaCodecInfo> regulars = new ArrayList<MediaCodecInfo>();

                ArrayList<MediaCodecInfo> all = new ArrayList<MediaCodecInfo>();