Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 64c63588 authored by Jeremy Wu's avatar Jeremy Wu Committed by Gerrit Code Review
Browse files

Merge "HFP: fix peer_codecs bitmask in RFCOMM and SDP workaround"

parents 05771919 6378fc02

system/bta/ag/bta_ag_act.cc

+1 −1
Original line number Diff line number Diff line
@@ -471,7 +471,7 @@ void bta_ag_rfc_open(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data) { 
      bool sdp_wbs_support = p_scb->peer_sdp_features & BTA_AG_FEAT_WBS_SUPPORT;

      if (!p_scb->received_at_bac && sdp_wbs_support) {

        p_scb->codec_updated = true;

        p_scb->peer_codecs = BTM_SCO_CODEC_CVSD & BTM_SCO_CODEC_MSBC;

        p_scb->peer_codecs = BTM_SCO_CODEC_CVSD | BTM_SCO_CODEC_MSBC;

        p_scb->sco_codec = UUID_CODEC_MSBC;

      }

    } else {

system/bta/ag/bta_ag_sdp.cc

+1 −1
Original line number Diff line number Diff line
@@ -369,7 +369,7 @@ bool bta_ag_sdp_find_attr(tBTA_AG_SCB* p_scb, tBTA_SERVICE_MASK service) { 
          // 2. But do not send required AT+BAC command

          // Will assume mSBC is enabled and try codec negotiation by default

          p_scb->codec_updated = true;

          p_scb->peer_codecs = BTM_SCO_CODEC_CVSD & BTM_SCO_CODEC_MSBC;

          p_scb->peer_codecs = BTM_SCO_CODEC_CVSD | BTM_SCO_CODEC_MSBC;

          p_scb->sco_codec = UUID_CODEC_MSBC;

        }

        if (sdp_features != p_scb->peer_sdp_features) {