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

Commit 0040c1aa authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

legacy: Replace BTA_AG_CODEC_CVSD => BTM_SCO_CODEC_CVSD am: f2289db8 

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1822168

Change-Id: Ia152090217744a9d89a054750d3f364393b85c78
parents 67fe0cb3 f2289db8

system/bta/ag/bta_ag_act.cc

+8 −8
Original line number Diff line number Diff line
@@ -328,8 +328,8 @@ void bta_ag_rfc_fail(tBTA_AG_SCB* p_scb, UNUSED_ATTR const tBTA_AG_DATA& data) { 
  p_scb->conn_handle = 0;

  p_scb->conn_service = 0;

  p_scb->peer_features = 0;

  p_scb->peer_codecs = BTA_AG_CODEC_CVSD;

  p_scb->sco_codec = BTA_AG_CODEC_CVSD;

  p_scb->peer_codecs = BTM_SCO_CODEC_CVSD;

  p_scb->sco_codec = BTM_SCO_CODEC_CVSD;

  p_scb->role = 0;

  p_scb->svc_conn = false;

  p_scb->hsp_version = HSP_VERSION_1_2;
@@ -363,8 +363,8 @@ void bta_ag_rfc_close(tBTA_AG_SCB* p_scb, 
  p_scb->conn_service = 0;

  p_scb->peer_features = 0;

  p_scb->masked_features = p_scb->features;

  p_scb->peer_codecs = BTA_AG_CODEC_CVSD;

  p_scb->sco_codec = BTA_AG_CODEC_CVSD;

  p_scb->peer_codecs = BTM_SCO_CODEC_CVSD;

  p_scb->sco_codec = BTM_SCO_CODEC_CVSD;

  /* Clear these flags upon SLC teardown */

  p_scb->codec_updated = false;

  p_scb->codec_fallback = false;
@@ -469,7 +469,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 = BTA_AG_CODEC_CVSD & BTA_AG_CODEC_MSBC;

        p_scb->peer_codecs = BTM_SCO_CODEC_CVSD & BTA_AG_CODEC_MSBC;

        p_scb->sco_codec = UUID_CODEC_MSBC;

      }

    } else {
@@ -801,8 +801,8 @@ void bta_ag_setcodec(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data) { 
  val.hdr.handle = bta_ag_scb_to_idx(p_scb);



  /* Check if the requested codec type is valid */

  if ((codec_type != BTM_SCO_CODEC_NONE) && (codec_type != BTA_AG_CODEC_CVSD) &&

      (codec_type != BTA_AG_CODEC_MSBC)) {

  if ((codec_type != BTM_SCO_CODEC_NONE) &&

      (codec_type != BTM_SCO_CODEC_CVSD) && (codec_type != BTA_AG_CODEC_MSBC)) {

    val.num = codec_type;

    val.hdr.status = BTA_AG_FAIL_RESOURCES;

    APPL_TRACE_ERROR("bta_ag_setcodec error: unsupported codec type %d",
@@ -812,7 +812,7 @@ void bta_ag_setcodec(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data) { 
  }



  if ((p_scb->peer_codecs & codec_type) || (codec_type == BTM_SCO_CODEC_NONE) ||

      (codec_type == BTA_AG_CODEC_CVSD)) {

      (codec_type == BTM_SCO_CODEC_CVSD)) {

    p_scb->sco_codec = codec_type;

    p_scb->codec_updated = true;

    val.num = codec_type;

system/bta/ag/bta_ag_cmd.cc

+5 −5
Original line number Diff line number Diff line
@@ -462,7 +462,7 @@ static tBTA_AG_PEER_CODEC bta_ag_parse_bac(tBTA_AG_SCB* p_scb, char* p_s, 
    uuid_codec = utl_str2int(p_s);

    switch (uuid_codec) {

      case UUID_CODEC_CVSD:

        retval |= BTA_AG_CODEC_CVSD;

        retval |= BTM_SCO_CODEC_CVSD;

        break;

      case UUID_CODEC_MSBC:

        retval |= BTA_AG_CODEC_MSBC;
@@ -1269,7 +1269,7 @@ void bta_ag_at_hfp_cback(tBTA_AG_SCB* p_scb, uint16_t cmd, uint8_t arg_type, 
          bta_ag_codec_negotiate(p_scb);

        }

      } else {

        p_scb->peer_codecs = BTA_AG_CODEC_CVSD;

        p_scb->peer_codecs = BTM_SCO_CODEC_CVSD;

        APPL_TRACE_ERROR(

            "Unexpected CMD:AT+BAC, Codec Negotiation is not supported");

      }
@@ -1282,7 +1282,7 @@ void bta_ag_at_hfp_cback(tBTA_AG_SCB* p_scb, uint16_t cmd, uint8_t arg_type, 


      switch (int_arg) {

        case UUID_CODEC_CVSD:

          codec_type = BTA_AG_CODEC_CVSD;

          codec_type = BTM_SCO_CODEC_CVSD;

          break;

        case UUID_CODEC_MSBC:

          codec_type = BTA_AG_CODEC_MSBC;
@@ -1294,7 +1294,7 @@ void bta_ag_at_hfp_cback(tBTA_AG_SCB* p_scb, uint16_t cmd, uint8_t arg_type, 
      }



      if (p_scb->codec_fallback)

        codec_sent = BTA_AG_CODEC_CVSD;

        codec_sent = BTM_SCO_CODEC_CVSD;

      else

        codec_sent = p_scb->sco_codec;
@@ -1770,7 +1770,7 @@ void bta_ag_send_bcs(tBTA_AG_SCB* p_scb) { 
      case BTM_SCO_CODEC_NONE:

        codec_uuid = UUID_CODEC_CVSD;

        break;

      case BTA_AG_CODEC_CVSD:

      case BTM_SCO_CODEC_CVSD:

        codec_uuid = UUID_CODEC_CVSD;

        break;

      case BTA_AG_CODEC_MSBC:

system/bta/ag/bta_ag_main.cc

+2 −2
Original line number Diff line number Diff line
@@ -143,8 +143,8 @@ static tBTA_AG_SCB* bta_ag_scb_alloc(void) { 
      p_scb->received_at_bac = false;

      p_scb->codec_updated = false;

      p_scb->codec_fallback = false;

      p_scb->peer_codecs = BTA_AG_CODEC_CVSD;

      p_scb->sco_codec = BTA_AG_CODEC_CVSD;

      p_scb->peer_codecs = BTM_SCO_CODEC_CVSD;

      p_scb->sco_codec = BTM_SCO_CODEC_CVSD;

      p_scb->peer_version = HFP_HSP_VERSION_UNKNOWN;

      p_scb->hsp_version = HSP_VERSION_1_2;

      p_scb->peer_sdp_features = 0;

system/bta/ag/bta_ag_sco.cc

+1 −1
Original line number Diff line number Diff line
@@ -352,7 +352,7 @@ static void bta_ag_cback_sco(tBTA_AG_SCB* p_scb, tBTA_AG_EVT event) { 
 ******************************************************************************/

static void bta_ag_create_sco(tBTA_AG_SCB* p_scb, bool is_orig) {

  LOG_DEBUG("BEFORE %s", p_scb->ToString().c_str());

  tBTA_AG_PEER_CODEC esco_codec = BTA_AG_CODEC_CVSD;

  tBTA_AG_PEER_CODEC esco_codec = BTM_SCO_CODEC_CVSD;



  if (!bta_ag_sco_is_active_device(p_scb->peer_addr)) {

    LOG(WARNING) << __func__ << ": device " << p_scb->peer_addr

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 = BTA_AG_CODEC_CVSD & BTA_AG_CODEC_MSBC;

          p_scb->peer_codecs = BTM_SCO_CODEC_CVSD & BTA_AG_CODEC_MSBC;

          p_scb->sco_codec = UUID_CODEC_MSBC;

        }

        if (sdp_features != p_scb->peer_sdp_features) {