commit b694f50de85f73a24f35796ebcc069acaa3973bf
author ValdikSS <iam@valdikss.org.ru> Mon Sep 17 19:04:27 2018 +0300
committer Jackeagle <jackeagle102@gmail.com> Fri Sep 04 05:45:51 2020 -0400
tree 3e3045bdaaabe2110df0e2820f0378642d47444d
parent 4390d530b40962a343793d5f9d675631343e5f67

Assume optional codecs are supported if were supported previously

This fix is required to properly follow codec reconfiguration for SBC HD
(SBC Dual Channel) in case of incoming Bluetooth connection.

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

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 71a1ab9..7908de0 100755
--- a/src/com/android/bluetooth/a2dp/A2dpService.java
+++ b/src/com/android/bluetooth/a2dp/A2dpService.java
@@ -1795,11 +1795,11 @@
             return;
         }
         if (previousSupport == BluetoothA2dp.OPTIONAL_CODECS_SUPPORT_UNKNOWN
-                || supportsOptional != (previousSupport
-                                    == BluetoothA2dp.OPTIONAL_CODECS_SUPPORTED)) {
+                || previousSupport == BluetoothA2dp.OPTIONAL_CODECS_NOT_SUPPORTED) {
             setSupportsOptionalCodecs(device, supportsOptional);
         }
-        if (supportsOptional) {
+        if (supportsOptional
+                || previousSupport == BluetoothA2dp.OPTIONAL_CODECS_SUPPORTED) {
             int enabled = getOptionalCodecsEnabled(device);
             switch (enabled) {
                 case BluetoothA2dp.OPTIONAL_CODECS_PREF_UNKNOWN: