commit be47eaf8cf6b8c2a66eecd0c07689ceb9c2a21c8
author Eric Laurent <elaurent@google.com> Tue Mar 21 23:41:08 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 21 23:41:09 2017 +0000
tree dc3f12f99f29b7bbbd13a5095a8703bbd62520ad
parent 65a629583f50daf1ec7bc3313d87daa14e0695ba
parent 0fc208d2ca3fd1437dd06b0a10ebf59b6d819950

Merge "audio: fix mistake in AudioDevice enum"

audio/common/2.0/types.hal

diff --git a/audio/common/2.0/types.hal b/audio/common/2.0/types.hal
index 8760a58..bad01fc 100644
--- a/audio/common/2.0/types.hal
+++ b/audio/common/2.0/types.hal
@@ -565,6 +565,7 @@
             OUT_IP |
             OUT_BUS |
             OUT_PROXY |
+            OUT_USB_HEADSET |
             OUT_DEFAULT),
     OUT_ALL_A2DP = (OUT_BLUETOOTH_A2DP |
             OUT_BLUETOOTH_A2DP_HEADPHONES |
@@ -572,7 +573,7 @@
     OUT_ALL_SCO  = (OUT_BLUETOOTH_SCO |
             OUT_BLUETOOTH_SCO_HEADSET |
             OUT_BLUETOOTH_SCO_CARKIT),
-    OUT_ALL_USB  = (OUT_USB_ACCESSORY | OUT_USB_DEVICE),
+    OUT_ALL_USB  = (OUT_USB_ACCESSORY | OUT_USB_DEVICE | OUT_USB_HEADSET),
     /* input devices */
     IN_COMMUNICATION         = BIT_IN | 0x1,
     IN_AMBIENT               = BIT_IN | 0x2,
@@ -629,9 +630,10 @@
             IN_IP |
             IN_BUS |
             IN_PROXY |
+            IN_USB_HEADSET |
             IN_DEFAULT),
     IN_ALL_SCO = IN_BLUETOOTH_SCO_HEADSET,
-    IN_ALL_USB  = (IN_USB_ACCESSORY | IN_USB_DEVICE),
+    IN_ALL_USB  = (IN_USB_ACCESSORY | IN_USB_DEVICE | IN_USB_HEADSET),
 };
 
 /*