summaryrefslogtreecommitdiffstats
path: root/audio
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@android.com>2014-03-17 15:56:18 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-17 15:56:18 +0000
commitdcc6e9f2994d1f8e3c0aa6d71c4fc6f423a07c55 (patch)
tree4bed19691d9f9e22b055954ce285f23d61bdcc50 /audio
parentd6a4fa9c08d3994d3efa3d0a8ff3040e65e20b35 (diff)
parente6c7127ef2491ddeb995ffb48843fda4e30ff9ff (diff)
downloadhardware_libhardware_legacy-dcc6e9f2994d1f8e3c0aa6d71c4fc6f423a07c55.zip
hardware_libhardware_legacy-dcc6e9f2994d1f8e3c0aa6d71c4fc6f423a07c55.tar.gz
hardware_libhardware_legacy-dcc6e9f2994d1f8e3c0aa6d71c4fc6f423a07c55.tar.bz2
am e6c7127e: am be39c1e4: Merge "audio policy : add AUDIO_DEVICE_IN_USB_DEVICE to sDeviceNameToEnumTable"
* commit 'e6c7127ef2491ddeb995ffb48843fda4e30ff9ff': audio policy : add AUDIO_DEVICE_IN_USB_DEVICE to sDeviceNameToEnumTable
Diffstat (limited to 'audio')
-rw-r--r--audio/AudioPolicyManagerBase.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/audio/AudioPolicyManagerBase.cpp b/audio/AudioPolicyManagerBase.cpp
index 6f58cf7..cac1575 100644
--- a/audio/AudioPolicyManagerBase.cpp
+++ b/audio/AudioPolicyManagerBase.cpp
@@ -3667,6 +3667,7 @@ const struct StringToEnum sDeviceNameToEnumTable[] = {
STRING_TO_ENUM(AUDIO_DEVICE_IN_ANLG_DOCK_HEADSET),
STRING_TO_ENUM(AUDIO_DEVICE_IN_DGTL_DOCK_HEADSET),
STRING_TO_ENUM(AUDIO_DEVICE_IN_USB_ACCESSORY),
+ STRING_TO_ENUM(AUDIO_DEVICE_IN_USB_DEVICE),
};
const struct StringToEnum sFlagNameToEnumTable[] = {