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

Commit cf2ae43e authored by Andy Hung's avatar Andy Hung Committed by Android (Google) Code Review
Browse files

Merge "audio: Add device constants for HDMI EARC" into sc-dev

parents 9898f37e 4da49450

audio/7.0/config/api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ package android.audio.policy.configuration.V7_0 { 
    enum_constant public static final android.audio.policy.configuration.V7_0.AudioDevice AUDIO_DEVICE_IN_FM_TUNER;

    enum_constant public static final android.audio.policy.configuration.V7_0.AudioDevice AUDIO_DEVICE_IN_HDMI;

    enum_constant public static final android.audio.policy.configuration.V7_0.AudioDevice AUDIO_DEVICE_IN_HDMI_ARC;

    enum_constant public static final android.audio.policy.configuration.V7_0.AudioDevice AUDIO_DEVICE_IN_HDMI_EARC;

    enum_constant public static final android.audio.policy.configuration.V7_0.AudioDevice AUDIO_DEVICE_IN_IP;

    enum_constant public static final android.audio.policy.configuration.V7_0.AudioDevice AUDIO_DEVICE_IN_LINE;

    enum_constant public static final android.audio.policy.configuration.V7_0.AudioDevice AUDIO_DEVICE_IN_LOOPBACK;
@@ -138,6 +139,7 @@ package android.audio.policy.configuration.V7_0 { 
    enum_constant public static final android.audio.policy.configuration.V7_0.AudioDevice AUDIO_DEVICE_OUT_FM;

    enum_constant public static final android.audio.policy.configuration.V7_0.AudioDevice AUDIO_DEVICE_OUT_HDMI;

    enum_constant public static final android.audio.policy.configuration.V7_0.AudioDevice AUDIO_DEVICE_OUT_HDMI_ARC;

    enum_constant public static final android.audio.policy.configuration.V7_0.AudioDevice AUDIO_DEVICE_OUT_HDMI_EARC;

    enum_constant public static final android.audio.policy.configuration.V7_0.AudioDevice AUDIO_DEVICE_OUT_HEARING_AID;

    enum_constant public static final android.audio.policy.configuration.V7_0.AudioDevice AUDIO_DEVICE_OUT_IP;

    enum_constant public static final android.audio.policy.configuration.V7_0.AudioDevice AUDIO_DEVICE_OUT_LINE;

audio/7.0/config/audio_policy_configuration.xsd

+2 −0
Original line number Diff line number Diff line
@@ -253,6 +253,7 @@ 
            <xs:enumeration value="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES"/>

            <xs:enumeration value="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER"/>

            <xs:enumeration value="AUDIO_DEVICE_OUT_HDMI"/>

            <xs:enumeration value="AUDIO_DEVICE_OUT_HDMI_EARC"/>

            <xs:enumeration value="AUDIO_DEVICE_OUT_AUX_DIGITAL"/>

            <xs:enumeration value="AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET"/>

            <xs:enumeration value="AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET"/>
@@ -304,6 +305,7 @@ 
            <xs:enumeration value="AUDIO_DEVICE_IN_USB_HEADSET"/>

            <xs:enumeration value="AUDIO_DEVICE_IN_BLUETOOTH_BLE"/>

            <xs:enumeration value="AUDIO_DEVICE_IN_HDMI_ARC"/>

            <xs:enumeration value="AUDIO_DEVICE_IN_HDMI_EARC"/>

            <xs:enumeration value="AUDIO_DEVICE_IN_ECHO_REFERENCE"/>

            <xs:enumeration value="AUDIO_DEVICE_IN_BLE_HEADSET"/>

            <xs:enumeration value="AUDIO_DEVICE_IN_DEFAULT"/>

audio/common/7.0/enums/include/android_audio_policy_configuration_V7_0-enums.h

+2 −0
Original line number Diff line number Diff line
@@ -155,6 +155,7 @@ static inline bool isOutputDevice(AudioDevice device) { 
        case AudioDevice::AUDIO_DEVICE_OUT_TELEPHONY_TX:

        case AudioDevice::AUDIO_DEVICE_OUT_LINE:

        case AudioDevice::AUDIO_DEVICE_OUT_HDMI_ARC:

        case AudioDevice::AUDIO_DEVICE_OUT_HDMI_EARC:

        case AudioDevice::AUDIO_DEVICE_OUT_SPDIF:

        case AudioDevice::AUDIO_DEVICE_OUT_FM:

        case AudioDevice::AUDIO_DEVICE_OUT_AUX_LINE:
@@ -197,6 +198,7 @@ static inline bool isOutputDevice(AudioDevice device) { 
        case AudioDevice::AUDIO_DEVICE_IN_USB_HEADSET:

        case AudioDevice::AUDIO_DEVICE_IN_BLUETOOTH_BLE:

        case AudioDevice::AUDIO_DEVICE_IN_HDMI_ARC:

        case AudioDevice::AUDIO_DEVICE_IN_HDMI_EARC:

        case AudioDevice::AUDIO_DEVICE_IN_ECHO_REFERENCE:

        case AudioDevice::AUDIO_DEVICE_IN_BLE_HEADSET:

        case AudioDevice::AUDIO_DEVICE_IN_DEFAULT: