commit 10c94f7a68644aed1a008469fba48ec2b246ca8d
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Jun 20 17:10:15 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 20 17:10:16 2017 +0000
tree 95b66c3b105bf71e3390ea11a5156acae6ef4cd4
parent 053359a38a8b4993732e3283990594e2b92d9426
parent aeeb179f5e1c99dba6a02ac4a21e43163568760b

Merge "audio policy config: add USB_HEADSET device" into oc-dr1-dev

services/audiopolicy/config/usb_audio_policy_configuration.xml

diff --git a/services/audiopolicy/config/usb_audio_policy_configuration.xml b/services/audiopolicy/config/usb_audio_policy_configuration.xml
index 1630a94..a487ecb 100644
--- a/services/audiopolicy/config/usb_audio_policy_configuration.xml
+++ b/services/audiopolicy/config/usb_audio_policy_configuration.xml
@@ -30,14 +30,18 @@
                      samplingRates="44100" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
         </devicePort>
         <devicePort tagName="USB Device Out" type="AUDIO_DEVICE_OUT_USB_DEVICE" role="sink"/>
+        <devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink"/>
         <devicePort tagName="USB Device In" type="AUDIO_DEVICE_IN_USB_DEVICE" role="source"/>
+        <devicePort tagName="USB Headset In" type="AUDIO_DEVICE_IN_USB_HEADSET" role="source"/>
     </devicePorts>
     <routes>
         <route type="mix" sink="USB Host Out"
                sources="usb_accessory output"/>
         <route type="mix" sink="USB Device Out"
                sources="usb_device output"/>
+        <route type="mix" sink="USB Headset Out"
+               sources="usb_device output"/>
         <route type="mix" sink="usb_device input"
-               sources="USB Device In"/>
+               sources="USB Device In,USB Headset In"/>
     </routes>
 </module>