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

Commit b751d0e5 authored by Paul Mclean's avatar Paul Mclean Committed by Android Git Automerger
Browse files

am 1b8f8ac8: am 4463053e: am a154b332: am c770b7a5: Merge "Add a (hidden)... 

am 1b8f8ac8: am 4463053e: am a154b332: am c770b7a5: Merge "Add a (hidden) mapping for REMOTE_SUBMIX device types for CTS test." into mnc-dev

* commit '1b8f8ac8':
  Add a (hidden) mapping for REMOTE_SUBMIX device types for CTS test.
parents 1da56c0b 1b8f8ac8

media/java/android/media/AudioDeviceInfo.java

+10 −4
Original line number Diff line number Diff line
@@ -109,6 +109,14 @@ public final class AudioDeviceInfo { 
     * A device type connected over IP.

     */

    public static final int TYPE_IP               = 20;

    /**

     * @hide

     * A remote-submix device.

     * We need this for CTS, but it is not part of the external API.

     * FIXME It has been suggested that CTS should only be testing public APIs.

     *   Consider this for a public API.

     */

    public static final int TYPE_REMOTE_SUBMIX    = 0x7FFF;



    private final AudioDevicePort mPort;
@@ -265,6 +273,7 @@ public final class AudioDeviceInfo { 
        INT_TO_EXT_DEVICE_MAPPING.put(AudioSystem.DEVICE_OUT_FM, TYPE_FM);

        INT_TO_EXT_DEVICE_MAPPING.put(AudioSystem.DEVICE_OUT_AUX_LINE, TYPE_AUX_LINE);

        INT_TO_EXT_DEVICE_MAPPING.put(AudioSystem.DEVICE_OUT_IP, TYPE_IP);

        INT_TO_EXT_DEVICE_MAPPING.put(AudioSystem.DEVICE_OUT_REMOTE_SUBMIX, TYPE_REMOTE_SUBMIX);



        INT_TO_EXT_DEVICE_MAPPING.put(AudioSystem.DEVICE_IN_BUILTIN_MIC, TYPE_BUILTIN_MIC);

        INT_TO_EXT_DEVICE_MAPPING.put(AudioSystem.DEVICE_IN_BLUETOOTH_SCO_HEADSET, TYPE_BLUETOOTH_SCO);
@@ -282,10 +291,7 @@ public final class AudioDeviceInfo { 
        INT_TO_EXT_DEVICE_MAPPING.put(AudioSystem.DEVICE_IN_SPDIF, TYPE_LINE_DIGITAL);

        INT_TO_EXT_DEVICE_MAPPING.put(AudioSystem.DEVICE_IN_BLUETOOTH_A2DP, TYPE_BLUETOOTH_A2DP);

        INT_TO_EXT_DEVICE_MAPPING.put(AudioSystem.DEVICE_IN_IP, TYPE_IP);



        // not covered here, legacy

        //AudioSystem.DEVICE_OUT_REMOTE_SUBMIX

        //AudioSystem.DEVICE_IN_REMOTE_SUBMIX

        INT_TO_EXT_DEVICE_MAPPING.put(AudioSystem.DEVICE_IN_REMOTE_SUBMIX, TYPE_REMOTE_SUBMIX);



        // privileges mapping to output device

        EXT_TO_INT_DEVICE_MAPPING = new SparseIntArray();