commit ac53a4af6afd1f4747f527dc28f9fec3c53f3901
author Terry Heo <terryheo@google.com> Mon Jul 14 01:56:51 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Jul 14 01:56:51 2014 +0000
tree 20b42224138b7c71d82612c3473e70ad0b9ecddd
parent 09ef42ab63dc36d1097390bda6bf08d1cf5332e1
parent a916e260db1e6c2c20fe0451ffe380f5e19af818

am a916e260: Merge "audio: add definition for new audio loopback input device"

* commit 'a916e260db1e6c2c20fe0451ffe380f5e19af818':
  audio: add definition for new audio loopback input device

include/system/audio.h

diff --git a/include/system/audio.h b/include/system/audio.h
index c7cd109..8530efa 100644
--- a/include/system/audio.h
+++ b/include/system/audio.h
@@ -499,6 +499,7 @@
     /* S/PDIF in */
     AUDIO_DEVICE_IN_SPDIF                 = AUDIO_DEVICE_BIT_IN | 0x10000,
     AUDIO_DEVICE_IN_BLUETOOTH_A2DP        = AUDIO_DEVICE_BIT_IN | 0x20000,
+    AUDIO_DEVICE_IN_LOOPBACK              = AUDIO_DEVICE_BIT_IN | 0x40000,
     AUDIO_DEVICE_IN_DEFAULT               = AUDIO_DEVICE_BIT_IN | AUDIO_DEVICE_BIT_DEFAULT,
 
     AUDIO_DEVICE_IN_ALL     = (AUDIO_DEVICE_IN_COMMUNICATION |
@@ -519,6 +520,7 @@
                                AUDIO_DEVICE_IN_LINE |
                                AUDIO_DEVICE_IN_SPDIF |
                                AUDIO_DEVICE_IN_BLUETOOTH_A2DP |
+                               AUDIO_DEVICE_IN_LOOPBACK |
                                AUDIO_DEVICE_IN_DEFAULT),
     AUDIO_DEVICE_IN_ALL_SCO = AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET,
     AUDIO_DEVICE_IN_ALL_USB  = (AUDIO_DEVICE_IN_USB_ACCESSORY |