diff --git a/audio/oriole/config/audio_policy_configuration.xml b/audio/oriole/config/audio_policy_configuration.xml
index 3dac849..188d533 100644
--- a/audio/oriole/config/audio_policy_configuration.xml
+++ b/audio/oriole/config/audio_policy_configuration.xml
@@ -20,6 +20,7 @@
- Speaker Safe
- Earpiece
- Built-In Mic
+ - Built-In Back Mic
- Telephony Tx
- Voice Call And Telephony Rx
- Echo Ref In
@@ -207,17 +208,17 @@
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/>
+ sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
+ sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
+ sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
+ sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In"/>
+ sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In"/>
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 b22a903..c3e64c0 100644
--- a/audio/oriole/config/audio_policy_configuration_a2dp_offload_disabled.xml
+++ b/audio/oriole/config/audio_policy_configuration_a2dp_offload_disabled.xml
@@ -20,6 +20,7 @@
- Speaker Safe
- Earpiece
- Built-In Mic
+ - Built-In Back Mic
- Telephony Tx
- Voice Call And Telephony Rx
- Echo Ref In
@@ -186,17 +187,17 @@
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/>
+ sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
+ sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
+ sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
+ sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In"/>
+ sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In"/>
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 a5dafff..d0b1986 100644
--- a/audio/oriole/config/audio_policy_configuration_bluetooth_legacy_hal.xml
+++ b/audio/oriole/config/audio_policy_configuration_bluetooth_legacy_hal.xml
@@ -20,6 +20,7 @@
- Speaker Safe
- Earpiece
- Built-In Mic
+ - Built-In Back Mic
- Telephony Tx
- Voice Call And Telephony Rx
- Echo Ref In
@@ -186,17 +187,17 @@
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/>
+ sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
+ sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
+ sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
+ sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In"/>
+ sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In"/>
diff --git a/audio/raven/config/audio_policy_configuration.xml b/audio/raven/config/audio_policy_configuration.xml
index 3dac849..188d533 100644
--- a/audio/raven/config/audio_policy_configuration.xml
+++ b/audio/raven/config/audio_policy_configuration.xml
@@ -20,6 +20,7 @@
- Speaker Safe
- Earpiece
- Built-In Mic
+ - Built-In Back Mic
- Telephony Tx
- Voice Call And Telephony Rx
- Echo Ref In
@@ -207,17 +208,17 @@
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/>
+ sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
+ sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
+ sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
+ sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In"/>
+ sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In"/>
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 b22a903..c3e64c0 100644
--- a/audio/raven/config/audio_policy_configuration_a2dp_offload_disabled.xml
+++ b/audio/raven/config/audio_policy_configuration_a2dp_offload_disabled.xml
@@ -20,6 +20,7 @@
- Speaker Safe
- Earpiece
- Built-In Mic
+ - Built-In Back Mic
- Telephony Tx
- Voice Call And Telephony Rx
- Echo Ref In
@@ -186,17 +187,17 @@
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/>
+ sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
+ sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
+ sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
+ sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In"/>
+ sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In"/>
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 a5dafff..d0b1986 100644
--- a/audio/raven/config/audio_policy_configuration_bluetooth_legacy_hal.xml
+++ b/audio/raven/config/audio_policy_configuration_bluetooth_legacy_hal.xml
@@ -20,6 +20,7 @@
- Speaker Safe
- Earpiece
- Built-In Mic
+ - Built-In Back Mic
- Telephony Tx
- Voice Call And Telephony Rx
- Echo Ref In
@@ -186,17 +187,17 @@
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/>
+ sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
+ sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
+ sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
+ sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In"/>
+ sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In"/>
diff --git a/audio/slider/config/audio_policy_configuration.xml b/audio/slider/config/audio_policy_configuration.xml
index 8220e30..42db5e8 100644
--- a/audio/slider/config/audio_policy_configuration.xml
+++ b/audio/slider/config/audio_policy_configuration.xml
@@ -20,6 +20,7 @@
- Speaker Safe
- Earpiece
- Built-In Mic
+ - Built-In Back Mic
- Telephony Tx
- Voice Call And Telephony Rx
@@ -199,17 +200,17 @@
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/>
+ sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
+ sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
+ sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
+ sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In"/>
+ sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In"/>
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 8a9694f..daf5152 100644
--- a/audio/slider/config/audio_policy_configuration_a2dp_offload_disabled.xml
+++ b/audio/slider/config/audio_policy_configuration_a2dp_offload_disabled.xml
@@ -20,6 +20,7 @@
- Speaker Safe
- Earpiece
- Built-In Mic
+ - Built-In Back Mic
- Telephony Tx
- Voice Call And Telephony Rx
@@ -178,17 +179,17 @@
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/>
+ sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
+ sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
+ sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
+ sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In"/>
+ sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In"/>
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 89b3da2..590b8f0 100644
--- a/audio/slider/config/audio_policy_configuration_bluetooth_legacy_hal.xml
+++ b/audio/slider/config/audio_policy_configuration_bluetooth_legacy_hal.xml
@@ -20,6 +20,7 @@
- Speaker Safe
- Earpiece
- Built-In Mic
+ - Built-In Back Mic
- Telephony Tx
- Voice Call And Telephony Rx
@@ -178,17 +179,17 @@
sources="primary output,deep buffer,haptic,compressed_offload,voip_rx"/>
+ sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
+ sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
+ sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
+ sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In"/>
+ sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In"/>
diff --git a/audio/whitefin/config/audio_policy_configuration.xml b/audio/whitefin/config/audio_policy_configuration.xml
index 7c5df64..af5ef8f 100644
--- a/audio/whitefin/config/audio_policy_configuration.xml
+++ b/audio/whitefin/config/audio_policy_configuration.xml
@@ -20,6 +20,7 @@
- Speaker Safe
- Earpiece
- Built-In Mic
+ - Built-In Back Mic
- Telephony Tx
- Voice Call And Telephony Rx
@@ -173,17 +174,17 @@
sources="primary output,deep buffer,compressed_offload,voip_rx"/>
+ sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
+ sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
+ sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
+ sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In"/>
+ sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In"/>
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 604ac8f..67ed8ca 100644
--- a/audio/whitefin/config/audio_policy_configuration_a2dp_offload_disabled.xml
+++ b/audio/whitefin/config/audio_policy_configuration_a2dp_offload_disabled.xml
@@ -20,6 +20,7 @@
- Speaker Safe
- Earpiece
- Built-In Mic
+ - Built-In Back Mic
- Telephony Tx
- Voice Call And Telephony Rx
@@ -173,17 +174,17 @@
sources="primary output,deep buffer,compressed_offload,voip_rx"/>
+ sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
+ sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
+ sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
+ sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In"/>
+ sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In"/>
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 bc02fe4..c69b318 100644
--- a/audio/whitefin/config/audio_policy_configuration_bluetooth_legacy_hal.xml
+++ b/audio/whitefin/config/audio_policy_configuration_bluetooth_legacy_hal.xml
@@ -20,6 +20,7 @@
- Speaker Safe
- Earpiece
- Built-In Mic
+ - Built-In Back Mic
- Telephony Tx
- Voice Call And Telephony Rx
@@ -173,17 +174,17 @@
sources="primary output,deep buffer,compressed_offload,voip_rx"/>
+ sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
+ sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
+ sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
+ sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In"/>
+ sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In"/>