commit 4390d530b40962a343793d5f9d675631343e5f67
author ValdikSS <iam@valdikss.org.ru> Mon Sep 10 02:02:50 2018 +0300
committer Jackeagle <jackeagle102@gmail.com> Fri Sep 04 05:45:51 2020 -0400
tree e9050de659a2e4ce33bb1d10bc36549b6e033f42
parent 97da6d242de88c84a849384a33262f51742d26f8

SBC Dual Channel (SBC HD Audio) support

"HD Audio" checkbox is not checked for SBC by default.

Change-Id: Id45c48aeaa2eb86f3dffa0cc825d1e09f1c00187
Signed-off-by: spezi77 <spezi7713@gmx.net>

src/com/android/bluetooth/a2dp/A2dpCodecConfig.java

diff --git a/src/com/android/bluetooth/a2dp/A2dpCodecConfig.java b/src/com/android/bluetooth/a2dp/A2dpCodecConfig.java
index 81044b3..260a08f 100644
--- a/src/com/android/bluetooth/a2dp/A2dpCodecConfig.java
+++ b/src/com/android/bluetooth/a2dp/A2dpCodecConfig.java
@@ -112,6 +112,14 @@
             BluetoothCodecConfig codecConfig = codecConfigArray[i];
             if (codecConfig != null && !codecConfig.isMandatoryCodec()) {
                 codecConfigArray[i] = null;
+            } else {
+                // Rebuild SBC selectable codec with Dual Channel (SBC HD audio)
+                codecConfigArray[i] = new BluetoothCodecConfig(
+                  BluetoothCodecConfig.SOURCE_CODEC_TYPE_SBC, mA2dpSourceCodecPrioritySbc,
+                  BluetoothCodecConfig.SAMPLE_RATE_NONE,
+                  BluetoothCodecConfig.BITS_PER_SAMPLE_NONE,
+                  BluetoothCodecConfig.CHANNEL_MODE_DUAL_CHANNEL, 0 /* codecSpecific1 */,
+                  0 /* codecSpecific2 */, 0 /* codecSpecific3 */, 0 /* codecSpecific4 */);
             }
         }
 

src/com/android/bluetooth/a2dp/A2dpService.java

diff --git a/src/com/android/bluetooth/a2dp/A2dpService.java b/src/com/android/bluetooth/a2dp/A2dpService.java
index d722e67..71a1ab9 100755
--- a/src/com/android/bluetooth/a2dp/A2dpService.java
+++ b/src/com/android/bluetooth/a2dp/A2dpService.java
@@ -1773,7 +1773,13 @@
             BluetoothCodecStatus codecStatus = sm.getCodecStatus();
             if (codecStatus != null) {
                 for (BluetoothCodecConfig config : codecStatus.getCodecsSelectableCapabilities()) {
-                    if (config.isMandatoryCodec()) {
+                    boolean isMandatoryCodecWithDualChannel = (config.isMandatoryCodec()
+                            && (config.getChannelMode() & config.CHANNEL_MODE_DUAL_CHANNEL)
+                                   == config.CHANNEL_MODE_DUAL_CHANNEL);
+                    if (isMandatoryCodecWithDualChannel) {
+                        hasMandatoryCodec = true;
+                        supportsOptional = true;
+                    } else if (config.isMandatoryCodec()) {
                         hasMandatoryCodec = true;
                     } else {
                         supportsOptional = true;