summaryrefslogtreecommitdiffstats
path: root/audio
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@android.com>2014-03-17 15:50:23 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-17 15:50:23 +0000
commite6c7127ef2491ddeb995ffb48843fda4e30ff9ff (patch)
treeeb683c5703492b0de52642539fbf8528ff8196a0 /audio
parentbfad19d2a12d0cc25ad74a58fe6838b0afe45776 (diff)
parentbe39c1e4cc6b635013553684953d1048d1599a8e (diff)
downloadhardware_libhardware_legacy-e6c7127ef2491ddeb995ffb48843fda4e30ff9ff.zip
hardware_libhardware_legacy-e6c7127ef2491ddeb995ffb48843fda4e30ff9ff.tar.gz
hardware_libhardware_legacy-e6c7127ef2491ddeb995ffb48843fda4e30ff9ff.tar.bz2
am be39c1e4: Merge "audio policy : add AUDIO_DEVICE_IN_USB_DEVICE to sDeviceNameToEnumTable"
* commit 'be39c1e4cc6b635013553684953d1048d1599a8e': 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 65e732f..9674adc 100644
--- a/audio/AudioPolicyManagerBase.cpp
+++ b/audio/AudioPolicyManagerBase.cpp
@@ -3666,6 +3666,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[] = {