From 8132cc2f2705d1f7f67a52f6a09598719267e490 Mon Sep 17 00:00:00 2001
From: David Li <dvdli@google.com>
Date: Wed, 12 May 2021 09:26:27 +0000
Subject: [PATCH] audio: upgrade audio.usb.default from v1 to v2

Bug: 187912470
Test: make -j128
Test: deep buffer and compress offload via speaker, USB headset, BT
earphone
Test: phone call via handset
Test: hotword detection

Change-Id: I80ec553797ff7955de0464b98046f879424d0fc5
---
 audio/oriole/config/audio_policy_configuration.xml              | 2 +-
 .../config/audio_policy_configuration_a2dp_offload_disabled.xml | 2 +-
 .../config/audio_policy_configuration_bluetooth_legacy_hal.xml  | 2 +-
 audio/raven/config/audio_policy_configuration.xml               | 2 +-
 .../config/audio_policy_configuration_a2dp_offload_disabled.xml | 2 +-
 .../config/audio_policy_configuration_bluetooth_legacy_hal.xml  | 2 +-
 audio/slider/config/audio_policy_configuration.xml              | 2 +-
 .../config/audio_policy_configuration_a2dp_offload_disabled.xml | 2 +-
 .../config/audio_policy_configuration_bluetooth_legacy_hal.xml  | 2 +-
 audio/whitefin/config/audio_policy_configuration.xml            | 2 +-
 .../config/audio_policy_configuration_a2dp_offload_disabled.xml | 2 +-
 .../config/audio_policy_configuration_bluetooth_legacy_hal.xml  | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/audio/oriole/config/audio_policy_configuration.xml b/audio/oriole/config/audio_policy_configuration.xml
index 658eb62..63958ed 100644
--- a/audio/oriole/config/audio_policy_configuration.xml
+++ b/audio/oriole/config/audio_policy_configuration.xml
@@ -216,7 +216,7 @@
         <!-- Bluetooth Audio HAL -->
         <xi:include href="bluetooth_audio_policy_configuration_7_0.xml"/>
         <!-- Usb Audio HAL -->
-        <module name="usb" halVersion="2.0">
+        <module name="usbv2" halVersion="2.0">
             <mixPorts>
                 <mixPort name="usb_accessory output" role="source">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
diff --git a/audio/oriole/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/oriole/config/audio_policy_configuration_a2dp_offload_disabled.xml
index 7814948..4ef5a68 100644
--- a/audio/oriole/config/audio_policy_configuration_a2dp_offload_disabled.xml
+++ b/audio/oriole/config/audio_policy_configuration_a2dp_offload_disabled.xml
@@ -195,7 +195,7 @@
         <!-- Bluetooth Audio HAL -->
         <xi:include href="bluetooth_audio_policy_configuration_7_0.xml"/>
         <!-- Usb Audio HAL -->
-        <module name="usb" halVersion="2.0">
+        <module name="usbv2" halVersion="2.0">
             <mixPorts>
                 <mixPort name="usb_accessory output" role="source">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
diff --git a/audio/oriole/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/oriole/config/audio_policy_configuration_bluetooth_legacy_hal.xml
index 23e885d..575c4c0 100644
--- a/audio/oriole/config/audio_policy_configuration_bluetooth_legacy_hal.xml
+++ b/audio/oriole/config/audio_policy_configuration_bluetooth_legacy_hal.xml
@@ -195,7 +195,7 @@
         <!-- A2dp Audio HAL -->
         <xi:include href="a2dp_audio_policy_configuration_7_0.xml"/>
         <!-- Usb Audio HAL -->
-        <module name="usb" halVersion="2.0">
+        <module name="usbv2" halVersion="2.0">
             <mixPorts>
                 <mixPort name="usb_accessory output" role="source">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
diff --git a/audio/raven/config/audio_policy_configuration.xml b/audio/raven/config/audio_policy_configuration.xml
index 658eb62..63958ed 100644
--- a/audio/raven/config/audio_policy_configuration.xml
+++ b/audio/raven/config/audio_policy_configuration.xml
@@ -216,7 +216,7 @@
         <!-- Bluetooth Audio HAL -->
         <xi:include href="bluetooth_audio_policy_configuration_7_0.xml"/>
         <!-- Usb Audio HAL -->
-        <module name="usb" halVersion="2.0">
+        <module name="usbv2" halVersion="2.0">
             <mixPorts>
                 <mixPort name="usb_accessory output" role="source">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
diff --git a/audio/raven/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/raven/config/audio_policy_configuration_a2dp_offload_disabled.xml
index 7814948..4ef5a68 100644
--- a/audio/raven/config/audio_policy_configuration_a2dp_offload_disabled.xml
+++ b/audio/raven/config/audio_policy_configuration_a2dp_offload_disabled.xml
@@ -195,7 +195,7 @@
         <!-- Bluetooth Audio HAL -->
         <xi:include href="bluetooth_audio_policy_configuration_7_0.xml"/>
         <!-- Usb Audio HAL -->
-        <module name="usb" halVersion="2.0">
+        <module name="usbv2" halVersion="2.0">
             <mixPorts>
                 <mixPort name="usb_accessory output" role="source">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
diff --git a/audio/raven/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/raven/config/audio_policy_configuration_bluetooth_legacy_hal.xml
index 23e885d..575c4c0 100644
--- a/audio/raven/config/audio_policy_configuration_bluetooth_legacy_hal.xml
+++ b/audio/raven/config/audio_policy_configuration_bluetooth_legacy_hal.xml
@@ -195,7 +195,7 @@
         <!-- A2dp Audio HAL -->
         <xi:include href="a2dp_audio_policy_configuration_7_0.xml"/>
         <!-- Usb Audio HAL -->
-        <module name="usb" halVersion="2.0">
+        <module name="usbv2" halVersion="2.0">
             <mixPorts>
                 <mixPort name="usb_accessory output" role="source">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
diff --git a/audio/slider/config/audio_policy_configuration.xml b/audio/slider/config/audio_policy_configuration.xml
index d7c2fb9..2841b85 100644
--- a/audio/slider/config/audio_policy_configuration.xml
+++ b/audio/slider/config/audio_policy_configuration.xml
@@ -216,7 +216,7 @@
         <!-- Bluetooth Audio HAL -->
         <xi:include href="bluetooth_audio_policy_configuration_7_0.xml"/>
         <!-- Usb Audio HAL -->
-        <module name="usb" halVersion="2.0">
+        <module name="usbv2" halVersion="2.0">
             <mixPorts>
                 <mixPort name="usb_accessory output" role="source">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
diff --git a/audio/slider/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/slider/config/audio_policy_configuration_a2dp_offload_disabled.xml
index 7814948..4ef5a68 100644
--- a/audio/slider/config/audio_policy_configuration_a2dp_offload_disabled.xml
+++ b/audio/slider/config/audio_policy_configuration_a2dp_offload_disabled.xml
@@ -195,7 +195,7 @@
         <!-- Bluetooth Audio HAL -->
         <xi:include href="bluetooth_audio_policy_configuration_7_0.xml"/>
         <!-- Usb Audio HAL -->
-        <module name="usb" halVersion="2.0">
+        <module name="usbv2" halVersion="2.0">
             <mixPorts>
                 <mixPort name="usb_accessory output" role="source">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
diff --git a/audio/slider/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/slider/config/audio_policy_configuration_bluetooth_legacy_hal.xml
index 23e885d..575c4c0 100644
--- a/audio/slider/config/audio_policy_configuration_bluetooth_legacy_hal.xml
+++ b/audio/slider/config/audio_policy_configuration_bluetooth_legacy_hal.xml
@@ -195,7 +195,7 @@
         <!-- A2dp Audio HAL -->
         <xi:include href="a2dp_audio_policy_configuration_7_0.xml"/>
         <!-- Usb Audio HAL -->
-        <module name="usb" halVersion="2.0">
+        <module name="usbv2" halVersion="2.0">
             <mixPorts>
                 <mixPort name="usb_accessory output" role="source">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
diff --git a/audio/whitefin/config/audio_policy_configuration.xml b/audio/whitefin/config/audio_policy_configuration.xml
index 77d4b0e..9c5d9f3 100644
--- a/audio/whitefin/config/audio_policy_configuration.xml
+++ b/audio/whitefin/config/audio_policy_configuration.xml
@@ -190,7 +190,7 @@
         <!-- Bluetooth Audio HAL -->
         <xi:include href="bluetooth_audio_policy_configuration_7_0.xml"/>
         <!-- Usb Audio HAL -->
-        <module name="usb" halVersion="2.0">
+        <module name="usbv2" halVersion="2.0">
             <mixPorts>
                 <mixPort name="usb_accessory output" role="source">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
diff --git a/audio/whitefin/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/whitefin/config/audio_policy_configuration_a2dp_offload_disabled.xml
index 766a550..9490ce8 100644
--- a/audio/whitefin/config/audio_policy_configuration_a2dp_offload_disabled.xml
+++ b/audio/whitefin/config/audio_policy_configuration_a2dp_offload_disabled.xml
@@ -190,7 +190,7 @@
         <!-- Bluetooth Audio HAL -->
         <xi:include href="bluetooth_audio_policy_configuration_7_0.xml"/>
         <!-- Usb Audio HAL -->
-        <module name="usb" halVersion="2.0">
+        <module name="usbv2" halVersion="2.0">
             <mixPorts>
                 <mixPort name="usb_accessory output" role="source">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
diff --git a/audio/whitefin/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/whitefin/config/audio_policy_configuration_bluetooth_legacy_hal.xml
index 7a97772..29ed9d5 100644
--- a/audio/whitefin/config/audio_policy_configuration_bluetooth_legacy_hal.xml
+++ b/audio/whitefin/config/audio_policy_configuration_bluetooth_legacy_hal.xml
@@ -190,7 +190,7 @@
         <!-- A2dp Audio HAL -->
         <xi:include href="a2dp_audio_policy_configuration_7_0.xml"/>
         <!-- Usb Audio HAL -->
-        <module name="usb" halVersion="2.0">
+        <module name="usbv2" halVersion="2.0">
             <mixPorts>
                 <mixPort name="usb_accessory output" role="source">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"