audio: upgrade audio.usb.default from v1 to v2 am: e4c436d79a

Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/14514151

Change-Id: I55e87d871a0871edaca284bfc7cc05af7918724b
This commit is contained in:
David Li 2021-06-08 06:34:47 +00:00 committed by Automerger Merge Worker
commit ad78c35f08
12 changed files with 12 additions and 12 deletions

View file

@ -216,7 +216,7 @@
<!-- Bluetooth Audio HAL --> <!-- Bluetooth Audio HAL -->
<xi:include href="bluetooth_audio_policy_configuration_7_0.xml"/> <xi:include href="bluetooth_audio_policy_configuration_7_0.xml"/>
<!-- Usb Audio HAL --> <!-- Usb Audio HAL -->
<module name="usb" halVersion="2.0"> <module name="usbv2" halVersion="2.0">
<mixPorts> <mixPorts>
<mixPort name="usb_accessory output" role="source"> <mixPort name="usb_accessory output" role="source">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT" <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

View file

@ -195,7 +195,7 @@
<!-- Bluetooth Audio HAL --> <!-- Bluetooth Audio HAL -->
<xi:include href="bluetooth_audio_policy_configuration_7_0.xml"/> <xi:include href="bluetooth_audio_policy_configuration_7_0.xml"/>
<!-- Usb Audio HAL --> <!-- Usb Audio HAL -->
<module name="usb" halVersion="2.0"> <module name="usbv2" halVersion="2.0">
<mixPorts> <mixPorts>
<mixPort name="usb_accessory output" role="source"> <mixPort name="usb_accessory output" role="source">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT" <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

View file

@ -195,7 +195,7 @@
<!-- A2dp Audio HAL --> <!-- A2dp Audio HAL -->
<xi:include href="a2dp_audio_policy_configuration_7_0.xml"/> <xi:include href="a2dp_audio_policy_configuration_7_0.xml"/>
<!-- Usb Audio HAL --> <!-- Usb Audio HAL -->
<module name="usb" halVersion="2.0"> <module name="usbv2" halVersion="2.0">
<mixPorts> <mixPorts>
<mixPort name="usb_accessory output" role="source"> <mixPort name="usb_accessory output" role="source">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT" <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

View file

@ -216,7 +216,7 @@
<!-- Bluetooth Audio HAL --> <!-- Bluetooth Audio HAL -->
<xi:include href="bluetooth_audio_policy_configuration_7_0.xml"/> <xi:include href="bluetooth_audio_policy_configuration_7_0.xml"/>
<!-- Usb Audio HAL --> <!-- Usb Audio HAL -->
<module name="usb" halVersion="2.0"> <module name="usbv2" halVersion="2.0">
<mixPorts> <mixPorts>
<mixPort name="usb_accessory output" role="source"> <mixPort name="usb_accessory output" role="source">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT" <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

View file

@ -195,7 +195,7 @@
<!-- Bluetooth Audio HAL --> <!-- Bluetooth Audio HAL -->
<xi:include href="bluetooth_audio_policy_configuration_7_0.xml"/> <xi:include href="bluetooth_audio_policy_configuration_7_0.xml"/>
<!-- Usb Audio HAL --> <!-- Usb Audio HAL -->
<module name="usb" halVersion="2.0"> <module name="usbv2" halVersion="2.0">
<mixPorts> <mixPorts>
<mixPort name="usb_accessory output" role="source"> <mixPort name="usb_accessory output" role="source">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT" <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

View file

@ -195,7 +195,7 @@
<!-- A2dp Audio HAL --> <!-- A2dp Audio HAL -->
<xi:include href="a2dp_audio_policy_configuration_7_0.xml"/> <xi:include href="a2dp_audio_policy_configuration_7_0.xml"/>
<!-- Usb Audio HAL --> <!-- Usb Audio HAL -->
<module name="usb" halVersion="2.0"> <module name="usbv2" halVersion="2.0">
<mixPorts> <mixPorts>
<mixPort name="usb_accessory output" role="source"> <mixPort name="usb_accessory output" role="source">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT" <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

View file

@ -216,7 +216,7 @@
<!-- Bluetooth Audio HAL --> <!-- Bluetooth Audio HAL -->
<xi:include href="bluetooth_audio_policy_configuration_7_0.xml"/> <xi:include href="bluetooth_audio_policy_configuration_7_0.xml"/>
<!-- Usb Audio HAL --> <!-- Usb Audio HAL -->
<module name="usb" halVersion="2.0"> <module name="usbv2" halVersion="2.0">
<mixPorts> <mixPorts>
<mixPort name="usb_accessory output" role="source"> <mixPort name="usb_accessory output" role="source">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT" <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

View file

@ -195,7 +195,7 @@
<!-- Bluetooth Audio HAL --> <!-- Bluetooth Audio HAL -->
<xi:include href="bluetooth_audio_policy_configuration_7_0.xml"/> <xi:include href="bluetooth_audio_policy_configuration_7_0.xml"/>
<!-- Usb Audio HAL --> <!-- Usb Audio HAL -->
<module name="usb" halVersion="2.0"> <module name="usbv2" halVersion="2.0">
<mixPorts> <mixPorts>
<mixPort name="usb_accessory output" role="source"> <mixPort name="usb_accessory output" role="source">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT" <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

View file

@ -195,7 +195,7 @@
<!-- A2dp Audio HAL --> <!-- A2dp Audio HAL -->
<xi:include href="a2dp_audio_policy_configuration_7_0.xml"/> <xi:include href="a2dp_audio_policy_configuration_7_0.xml"/>
<!-- Usb Audio HAL --> <!-- Usb Audio HAL -->
<module name="usb" halVersion="2.0"> <module name="usbv2" halVersion="2.0">
<mixPorts> <mixPorts>
<mixPort name="usb_accessory output" role="source"> <mixPort name="usb_accessory output" role="source">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT" <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

View file

@ -190,7 +190,7 @@
<!-- Bluetooth Audio HAL --> <!-- Bluetooth Audio HAL -->
<xi:include href="bluetooth_audio_policy_configuration_7_0.xml"/> <xi:include href="bluetooth_audio_policy_configuration_7_0.xml"/>
<!-- Usb Audio HAL --> <!-- Usb Audio HAL -->
<module name="usb" halVersion="2.0"> <module name="usbv2" halVersion="2.0">
<mixPorts> <mixPorts>
<mixPort name="usb_accessory output" role="source"> <mixPort name="usb_accessory output" role="source">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT" <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

View file

@ -190,7 +190,7 @@
<!-- Bluetooth Audio HAL --> <!-- Bluetooth Audio HAL -->
<xi:include href="bluetooth_audio_policy_configuration_7_0.xml"/> <xi:include href="bluetooth_audio_policy_configuration_7_0.xml"/>
<!-- Usb Audio HAL --> <!-- Usb Audio HAL -->
<module name="usb" halVersion="2.0"> <module name="usbv2" halVersion="2.0">
<mixPorts> <mixPorts>
<mixPort name="usb_accessory output" role="source"> <mixPort name="usb_accessory output" role="source">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT" <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

View file

@ -190,7 +190,7 @@
<!-- A2dp Audio HAL --> <!-- A2dp Audio HAL -->
<xi:include href="a2dp_audio_policy_configuration_7_0.xml"/> <xi:include href="a2dp_audio_policy_configuration_7_0.xml"/>
<!-- Usb Audio HAL --> <!-- Usb Audio HAL -->
<module name="usb" halVersion="2.0"> <module name="usbv2" halVersion="2.0">
<mixPorts> <mixPorts>
<mixPort name="usb_accessory output" role="source"> <mixPort name="usb_accessory output" role="source">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT" <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"