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

Commit e6787eee authored by Mikhail Naganov's avatar Mikhail Naganov Committed by android-build-merger
Browse files

Merge "Audio HAL: Add missing device to XSD" am: 128f565f 

am: 1c6996ed

Change-Id: I57022558da811595b896d69c99bea54c41fc8d29
parents 1dbd3895 1c6996ed

audio/4.0/config/api/current.txt

+4 −0
Original line number Diff line number Diff line
@@ -114,11 +114,15 @@ package audio.policy.configuration.V4_0 { 
    enum_constant public static final audio.policy.configuration.V4_0.AudioFormat AUDIO_FORMAT_EVRCNW;

    enum_constant public static final audio.policy.configuration.V4_0.AudioFormat AUDIO_FORMAT_EVRCWB;

    enum_constant public static final audio.policy.configuration.V4_0.AudioFormat AUDIO_FORMAT_E_AC3;

    enum_constant public static final audio.policy.configuration.V4_0.AudioFormat AUDIO_FORMAT_E_AC3_JOC;

    enum_constant public static final audio.policy.configuration.V4_0.AudioFormat AUDIO_FORMAT_FLAC;

    enum_constant public static final audio.policy.configuration.V4_0.AudioFormat AUDIO_FORMAT_HE_AAC_V1;

    enum_constant public static final audio.policy.configuration.V4_0.AudioFormat AUDIO_FORMAT_HE_AAC_V2;

    enum_constant public static final audio.policy.configuration.V4_0.AudioFormat AUDIO_FORMAT_IEC61937;

    enum_constant public static final audio.policy.configuration.V4_0.AudioFormat AUDIO_FORMAT_LDAC;

    enum_constant public static final audio.policy.configuration.V4_0.AudioFormat AUDIO_FORMAT_MAT_1_0;

    enum_constant public static final audio.policy.configuration.V4_0.AudioFormat AUDIO_FORMAT_MAT_2_0;

    enum_constant public static final audio.policy.configuration.V4_0.AudioFormat AUDIO_FORMAT_MAT_2_1;

    enum_constant public static final audio.policy.configuration.V4_0.AudioFormat AUDIO_FORMAT_MP2;

    enum_constant public static final audio.policy.configuration.V4_0.AudioFormat AUDIO_FORMAT_MP3;

    enum_constant public static final audio.policy.configuration.V4_0.AudioFormat AUDIO_FORMAT_OPUS;

audio/4.0/config/audio_policy_configuration.xsd

+4 −0
Original line number Diff line number Diff line
@@ -357,6 +357,10 @@ 
            <xs:enumeration value="AUDIO_FORMAT_APTX_HD"/>

            <xs:enumeration value="AUDIO_FORMAT_AC4"/>

            <xs:enumeration value="AUDIO_FORMAT_LDAC"/>

            <xs:enumeration value="AUDIO_FORMAT_E_AC3_JOC"/>

            <xs:enumeration value="AUDIO_FORMAT_MAT_1_0"/>

            <xs:enumeration value="AUDIO_FORMAT_MAT_2_0"/>

            <xs:enumeration value="AUDIO_FORMAT_MAT_2_1"/>

        </xs:restriction>

    </xs:simpleType>

    <xs:simpleType name="extendableAudioFormat">