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

Commit a1606bc3 authored by Myles Watson's avatar Myles Watson Committed by Automerger Merge Worker
Browse files

Merge "legacy: Replace BTA_AG_CODEC_NONE => BTM_SCO_CODEC_NONE" am: 831e8925... 

Merge "legacy: Replace BTA_AG_CODEC_NONE => BTM_SCO_CODEC_NONE" am: 831e8925 am: 3f53be1a am: f3a583a9 am: 7ffb25c8 am: 585a4521

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

Change-Id: I49efc6bef3800a52067bd4e77c5d9d4846e9c816
parents b567f299 585a4521

system/bta/ag/bta_ag_act.cc

+2 −2
Original line number Original line Diff line number Diff line
@@ -801,7 +801,7 @@ void bta_ag_setcodec(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data) { 
  val.hdr.handle = bta_ag_scb_to_idx(p_scb);

  val.hdr.handle = bta_ag_scb_to_idx(p_scb);





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

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

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

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

      (codec_type != BTA_AG_CODEC_MSBC)) {

      (codec_type != BTA_AG_CODEC_MSBC)) {

    val.num = codec_type;

    val.num = codec_type;

    val.hdr.status = BTA_AG_FAIL_RESOURCES;

    val.hdr.status = BTA_AG_FAIL_RESOURCES;
@@ -811,7 +811,7 @@ void bta_ag_setcodec(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data) { 
    return;

    return;

  }

  }





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

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

      (codec_type == BTA_AG_CODEC_CVSD)) {

      (codec_type == BTA_AG_CODEC_CVSD)) {

    p_scb->sco_codec = codec_type;

    p_scb->sco_codec = codec_type;

    p_scb->codec_updated = true;

    p_scb->codec_updated = true;

system/bta/ag/bta_ag_cmd.cc

+2 −2
Original line number Original line Diff line number Diff line
@@ -440,7 +440,7 @@ static uint8_t bta_ag_parse_chld(UNUSED_ATTR tBTA_AG_SCB* p_scb, char* p_s) { 
 ******************************************************************************/

 ******************************************************************************/

static tBTA_AG_PEER_CODEC bta_ag_parse_bac(tBTA_AG_SCB* p_scb, char* p_s,

static tBTA_AG_PEER_CODEC bta_ag_parse_bac(tBTA_AG_SCB* p_scb, char* p_s,

                                           char* p_end) {

                                           char* p_end) {

  tBTA_AG_PEER_CODEC retval = BTA_AG_CODEC_NONE;

  tBTA_AG_PEER_CODEC retval = BTM_SCO_CODEC_NONE;

  uint16_t uuid_codec;

  uint16_t uuid_codec;

  char* p;

  char* p;
@@ -1767,7 +1767,7 @@ void bta_ag_send_bcs(tBTA_AG_SCB* p_scb) { 
    codec_uuid = UUID_CODEC_CVSD;

    codec_uuid = UUID_CODEC_CVSD;

  } else {

  } else {

    switch (p_scb->sco_codec) {

    switch (p_scb->sco_codec) {

      case BTA_AG_CODEC_NONE:

      case BTM_SCO_CODEC_NONE:

        codec_uuid = UUID_CODEC_CVSD;

        codec_uuid = UUID_CODEC_CVSD;

        break;

        break;

      case BTA_AG_CODEC_CVSD:

      case BTA_AG_CODEC_CVSD:

system/bta/ag/bta_ag_sco.cc

+2 −2
Original line number Original line Diff line number Diff line
@@ -214,7 +214,7 @@ static void bta_ag_sco_disc_cback(uint16_t sco_idx) { 
                       __func__);

                       __func__);

    }

    }





    bta_ag_cb.sco.p_curr_scb->inuse_codec = BTA_AG_CODEC_NONE;

    bta_ag_cb.sco.p_curr_scb->inuse_codec = BTM_SCO_CODEC_NONE;





    do_in_main_thread(FROM_HERE,

    do_in_main_thread(FROM_HERE,

                      base::Bind(&bta_ag_sm_execute_by_handle, handle,

                      base::Bind(&bta_ag_sm_execute_by_handle, handle,
@@ -1324,7 +1324,7 @@ void bta_ag_sco_conn_rsp(tBTA_AG_SCB* p_scb, 
  }

  }





  /* If SCO open was initiated from HS, it must be CVSD */

  /* If SCO open was initiated from HS, it must be CVSD */

  p_scb->inuse_codec = BTA_AG_CODEC_NONE;

  p_scb->inuse_codec = BTM_SCO_CODEC_NONE;

  /* Send pending commands to create SCO connection to peer */

  /* Send pending commands to create SCO connection to peer */

  bta_ag_create_pending_sco(p_scb, bta_ag_cb.sco.is_local);

  bta_ag_create_pending_sco(p_scb, bta_ag_cb.sco.is_local);

}

}

system/bta/include/bta_ag_api.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -197,7 +197,6 @@ typedef uint16_t tBTA_AG_PEER_FEAT; 




/* HFP peer supported codec masks */

/* HFP peer supported codec masks */

// TODO(google) This should use common definitions

// TODO(google) This should use common definitions

#define BTA_AG_CODEC_NONE BTM_SCO_CODEC_NONE

#define BTA_AG_CODEC_CVSD BTM_SCO_CODEC_CVSD /* CVSD */

#define BTA_AG_CODEC_CVSD BTM_SCO_CODEC_CVSD /* CVSD */

#define BTA_AG_CODEC_MSBC BTM_SCO_CODEC_MSBC /* mSBC */

#define BTA_AG_CODEC_MSBC BTM_SCO_CODEC_MSBC /* mSBC */

typedef uint16_t tBTA_AG_PEER_CODEC;

typedef uint16_t tBTA_AG_PEER_CODEC;