Fix for SS Level U headset not connecting

Added the changes to do proper comparison of the codec configuration
based on codec selected by the remote headset

CRs-Fixed: 1052332

Change-Id: I078f07b39ab61ea2755333f0d94afe9efaf86c85

diff --git a/btif/co/bta_av_co.c b/btif/co/bta_av_co.c
index 8e5b295..478e2e8 100644 (file)
--- a/btif/co/bta_av_co.c
+++ b/btif/co/bta_av_co.c
@@ -949,7 +949,10 @@ void bta_av_co_audio_setconfig(tBTA_AV_HNDL hndl, tBTA_AV_CODEC codec_type,
                 APPL_TRACE_DEBUG("%s codecId = %d", __func__, codecId);
                 APPL_TRACE_DEBUG("%s vendorId = %x", __func__, vendorId);
 
-                if ((codec_type != A2D_NON_A2DP_MEDIA_CT) || memcmp(p_codec_info, bta_av_co_cb.codec_cfg->info, 5))
+                if ((codec_type != A2D_NON_A2DP_MEDIA_CT) ||
+                    (codecId != A2D_APTX_CODEC_ID_BLUETOOTH) ||
+                    (vendorId != A2D_APTX_VENDOR_ID) ||
+                    memcmp(p_codec_info, bta_av_co_cb.codec_cfg_aptx.info, 5))
                 {
                     APPL_TRACE_DEBUG("%s recfg_needed", __func__);
                     recfg_needed = TRUE;
@@ -960,7 +963,7 @@ void bta_av_co_audio_setconfig(tBTA_AV_HNDL hndl, tBTA_AV_CODEC codec_type,
                     recfg_needed = TRUE;
                 }
 
-                if (codecId == A2D_APTX_CODEC_ID_BLUETOOTH)
+                if ((codecId == A2D_APTX_CODEC_ID_BLUETOOTH) && (vendorId == A2D_APTX_VENDOR_ID))
                 {
                     APPL_TRACE_DEBUG("%s aptX", __func__);
                     bta_av_co_cb.codec_cfg_aptx_setconfig.id = A2D_NON_A2DP_MEDIA_CT;