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

Commit 70d36a04 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "audio: Add more legacy channel masks for the input direction" into udc-qpr-dev

parents ac3635ef e924b550

audio/aidl/default/config/audioPolicy/api/current.txt

+5 −0
Original line number Diff line number Diff line
@@ -33,14 +33,19 @@ package android.audio.policy.configuration { 
    enum_constant public static final android.audio.policy.configuration.AudioChannelMask AUDIO_CHANNEL_INDEX_MASK_8;

    enum_constant public static final android.audio.policy.configuration.AudioChannelMask AUDIO_CHANNEL_INDEX_MASK_9;

    enum_constant public static final android.audio.policy.configuration.AudioChannelMask AUDIO_CHANNEL_IN_2POINT0POINT2;

    enum_constant public static final android.audio.policy.configuration.AudioChannelMask AUDIO_CHANNEL_IN_2POINT1;

    enum_constant public static final android.audio.policy.configuration.AudioChannelMask AUDIO_CHANNEL_IN_2POINT1POINT2;

    enum_constant public static final android.audio.policy.configuration.AudioChannelMask AUDIO_CHANNEL_IN_3POINT0POINT2;

    enum_constant public static final android.audio.policy.configuration.AudioChannelMask AUDIO_CHANNEL_IN_3POINT1;

    enum_constant public static final android.audio.policy.configuration.AudioChannelMask AUDIO_CHANNEL_IN_3POINT1POINT2;

    enum_constant public static final android.audio.policy.configuration.AudioChannelMask AUDIO_CHANNEL_IN_5POINT1;

    enum_constant public static final android.audio.policy.configuration.AudioChannelMask AUDIO_CHANNEL_IN_6;

    enum_constant public static final android.audio.policy.configuration.AudioChannelMask AUDIO_CHANNEL_IN_FRONT_BACK;

    enum_constant public static final android.audio.policy.configuration.AudioChannelMask AUDIO_CHANNEL_IN_MONO;

    enum_constant public static final android.audio.policy.configuration.AudioChannelMask AUDIO_CHANNEL_IN_PENTA;

    enum_constant public static final android.audio.policy.configuration.AudioChannelMask AUDIO_CHANNEL_IN_QUAD;

    enum_constant public static final android.audio.policy.configuration.AudioChannelMask AUDIO_CHANNEL_IN_STEREO;

    enum_constant public static final android.audio.policy.configuration.AudioChannelMask AUDIO_CHANNEL_IN_TRI;

    enum_constant public static final android.audio.policy.configuration.AudioChannelMask AUDIO_CHANNEL_IN_VOICE_CALL_MONO;

    enum_constant public static final android.audio.policy.configuration.AudioChannelMask AUDIO_CHANNEL_IN_VOICE_DNLINK_MONO;

    enum_constant public static final android.audio.policy.configuration.AudioChannelMask AUDIO_CHANNEL_IN_VOICE_UPLINK_MONO;

audio/aidl/default/config/audioPolicy/audio_policy_configuration.xsd

+5 −0
Original line number Diff line number Diff line
@@ -535,12 +535,17 @@ 
            <xs:enumeration value="AUDIO_CHANNEL_OUT_STEREO_HAPTIC_AB"/>

            <xs:enumeration value="AUDIO_CHANNEL_IN_MONO"/>

            <xs:enumeration value="AUDIO_CHANNEL_IN_STEREO"/>

            <xs:enumeration value="AUDIO_CHANNEL_IN_2POINT1"/>

            <xs:enumeration value="AUDIO_CHANNEL_IN_FRONT_BACK"/>

            <xs:enumeration value="AUDIO_CHANNEL_IN_TRI"/>

            <xs:enumeration value="AUDIO_CHANNEL_IN_3POINT1"/>

            <xs:enumeration value="AUDIO_CHANNEL_IN_6"/>

            <xs:enumeration value="AUDIO_CHANNEL_IN_2POINT0POINT2"/>

            <xs:enumeration value="AUDIO_CHANNEL_IN_2POINT1POINT2"/>

            <xs:enumeration value="AUDIO_CHANNEL_IN_3POINT0POINT2"/>

            <xs:enumeration value="AUDIO_CHANNEL_IN_3POINT1POINT2"/>

            <xs:enumeration value="AUDIO_CHANNEL_IN_QUAD"/>

            <xs:enumeration value="AUDIO_CHANNEL_IN_PENTA"/>

            <xs:enumeration value="AUDIO_CHANNEL_IN_5POINT1"/>

            <xs:enumeration value="AUDIO_CHANNEL_IN_VOICE_UPLINK_MONO"/>

            <xs:enumeration value="AUDIO_CHANNEL_IN_VOICE_DNLINK_MONO"/>