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

Commit 2332b994 authored by Jean-Michel Trivi's avatar Jean-Michel Trivi
Browse files

AudioFormat: fix annotation for format getter 

getEncoding() can return ENCODING_INVALID, and thus this value
needs to be part of the IntDef used for the return value
annotation.

Bug: 327162475
Test: make
Change-Id: I20a186606ae17299f0b3bc1ae026eedcde6be8d4
parent 2bcb9138

media/java/android/media/AudioFormat.java

+39 −1
Original line number Diff line number Diff line
@@ -1079,7 +1079,7 @@ public final class AudioFormat implements Parcelable { 
     * @return one of the values that can be set in {@link Builder#setEncoding(int)} or

     * {@link AudioFormat#ENCODING_INVALID} if not set.

     */

    public @Encoding int getEncoding() {

    public @EncodingCanBeInvalid int getEncoding() {

        return mEncoding;

    }
@@ -1486,6 +1486,44 @@ public final class AudioFormat implements Parcelable { 
    @Retention(RetentionPolicy.SOURCE)

    public @interface Encoding {}



    /** @hide same as @Encoding, but adding ENCODING_INVALID */

    @IntDef(flag = false, prefix = "ENCODING", value = {

            ENCODING_INVALID,

            ENCODING_DEFAULT,

            ENCODING_PCM_16BIT,

            ENCODING_PCM_8BIT,

            ENCODING_PCM_FLOAT,

            ENCODING_AC3,

            ENCODING_E_AC3,

            ENCODING_DTS,

            ENCODING_DTS_HD,

            ENCODING_MP3,

            ENCODING_AAC_LC,

            ENCODING_AAC_HE_V1,

            ENCODING_AAC_HE_V2,

            ENCODING_IEC61937,

            ENCODING_DOLBY_TRUEHD,

            ENCODING_AAC_ELD,

            ENCODING_AAC_XHE,

            ENCODING_AC4,

            ENCODING_E_AC3_JOC,

            ENCODING_DOLBY_MAT,

            ENCODING_OPUS,

            ENCODING_PCM_24BIT_PACKED,

            ENCODING_PCM_32BIT,

            ENCODING_MPEGH_BL_L3,

            ENCODING_MPEGH_BL_L4,

            ENCODING_MPEGH_LC_L3,

            ENCODING_MPEGH_LC_L4,

            ENCODING_DTS_UHD_P1,

            ENCODING_DRA,

            ENCODING_DTS_HD_MA,

            ENCODING_DTS_UHD_P2,

            ENCODING_DSD }

    )

    @Retention(RetentionPolicy.SOURCE)

    public @interface EncodingCanBeInvalid {}



    /** @hide */

    public static final int[] SURROUND_SOUND_ENCODING = {

            ENCODING_AC3,