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

Commit 0543b17e authored by Terry Heo's avatar Terry Heo Committed by Android (Google) Code Review
Browse files

Merge "AudioSystem: add definition for loopback input device"

parents ddece691 112c19ee

media/java/android/media/AudioManager.java

+4 −0
Original line number Diff line number Diff line
@@ -2666,6 +2666,10 @@ public class AudioManager { 
     * The audio input device code for a S/PDIF digital connection

     */

    public static final int DEVICE_IN_SPDIF = AudioSystem.DEVICE_IN_SPDIF;

    /** @hide

     * The audio input device code for audio loopback

     */

    public static final int DEVICE_IN_LOOPBACK = AudioSystem.DEVICE_IN_LOOPBACK;



    /**

     * Return true if the device code corresponds to an output device.

media/java/android/media/AudioSystem.java

+2 −0
Original line number Diff line number Diff line
@@ -312,6 +312,7 @@ public class AudioSystem 
    public static final int DEVICE_IN_LINE = DEVICE_BIT_IN | 0x8000;

    public static final int DEVICE_IN_SPDIF = DEVICE_BIT_IN | 0x10000;

    public static final int DEVICE_IN_BLUETOOTH_A2DP = DEVICE_BIT_IN | 0x20000;

    public static final int DEVICE_IN_LOOPBACK = DEVICE_BIT_IN | 0x40000;

    public static final int DEVICE_IN_DEFAULT = DEVICE_BIT_IN | DEVICE_BIT_DEFAULT;



    public static final int DEVICE_IN_ALL = (DEVICE_IN_COMMUNICATION |
@@ -332,6 +333,7 @@ public class AudioSystem 
                                             DEVICE_IN_LINE |

                                             DEVICE_IN_SPDIF |

                                             DEVICE_IN_BLUETOOTH_A2DP |

                                             DEVICE_IN_LOOPBACK |

                                             DEVICE_IN_DEFAULT);

    public static final int DEVICE_IN_ALL_SCO = DEVICE_IN_BLUETOOTH_SCO_HEADSET;

    public static final int DEVICE_IN_ALL_USB = (DEVICE_IN_USB_ACCESSORY |