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

Commit 7e982833 authored by Ian Hopkins's avatar Ian Hopkins Committed by Android (Google) Code Review
Browse files

Merge "Add @Nullable to methods that can and do return null. No behavior change." into main

parents 2a0824e2 9b684a47

core/api/current.txt

+3 −3
Original line number Diff line number Diff line
@@ -23332,12 +23332,12 @@ package android.media { 
  public static final class MediaCodecInfo.CodecCapabilities {

    ctor public MediaCodecInfo.CodecCapabilities();

    method public static android.media.MediaCodecInfo.CodecCapabilities createFromProfileLevel(String, int, int);

    method public android.media.MediaCodecInfo.AudioCapabilities getAudioCapabilities();

    method @Nullable public android.media.MediaCodecInfo.AudioCapabilities getAudioCapabilities();

    method public android.media.MediaFormat getDefaultFormat();

    method public android.media.MediaCodecInfo.EncoderCapabilities getEncoderCapabilities();

    method @Nullable public android.media.MediaCodecInfo.EncoderCapabilities getEncoderCapabilities();

    method public int getMaxSupportedInstances();

    method public String getMimeType();

    method public android.media.MediaCodecInfo.VideoCapabilities getVideoCapabilities();

    method @Nullable public android.media.MediaCodecInfo.VideoCapabilities getVideoCapabilities();

    method public boolean isFeatureRequired(String);

    method public boolean isFeatureSupported(String);

    method public boolean isFormatSupported(android.media.MediaFormat);

media/java/android/media/MediaCodecInfo.java

+9 −0
Original line number Diff line number Diff line
@@ -1223,8 +1223,14 @@ public final class MediaCodecInfo { 
        private static final String TAG = "CodecCapabilities";



        // NEW-STYLE CAPABILITIES

        // Capabilities for an audio codec.

        @Nullable

        private AudioCapabilities mAudioCaps;

        // Capabilities for a video codec.

        @Nullable

        private VideoCapabilities mVideoCaps;

        // Capabilities specific to an encoder (vs. a decoder).

        @Nullable

        private EncoderCapabilities mEncoderCaps;

        private MediaFormat mDefaultFormat;
@@ -1262,6 +1268,7 @@ public final class MediaCodecInfo { 
        /**

         * Returns the audio capabilities or {@code null} if this is not an audio codec.

         */

        @Nullable

        public AudioCapabilities getAudioCapabilities() {

            return mAudioCaps;

        }
@@ -1273,6 +1280,7 @@ public final class MediaCodecInfo { 
        /**

         * Returns the encoding capabilities or {@code null} if this is not an encoder.

         */

        @Nullable

        public EncoderCapabilities getEncoderCapabilities() {

            return mEncoderCaps;

        }
@@ -1284,6 +1292,7 @@ public final class MediaCodecInfo { 
        /**

         * Returns the video capabilities or {@code null} if this is not a video codec.

         */

        @Nullable

        public VideoCapabilities getVideoCapabilities() {

            return mVideoCaps;

        }