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

Commit 1838e557 authored by Zach Johnson's avatar Zach Johnson
Browse files

Remove BTA_ID_AVK 

It's not used.

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I6db43270da17678f7c50463967c60e3cfa156d51
parent 9f5e0fc1

system/bta/ar/bta_ar.cc

+0 −12
Original line number Diff line number Diff line
@@ -43,8 +43,6 @@ static uint8_t bta_ar_id(tBTA_SYS_ID sys_id) { 
  uint8_t mask = 0;

  if (sys_id == BTA_ID_AV) {

    mask = BTA_AR_AV_MASK;

  } else if (sys_id == BTA_ID_AVK) {

    mask = BTA_AR_AVK_MASK;

  }



  return mask;
@@ -99,9 +97,6 @@ void bta_ar_reg_avdt(AvdtpRcb* p_reg, tAVDT_CTRL_CBACK* p_cback, 
  if (sys_id == BTA_ID_AV) {

    bta_ar_cb.p_av_conn_cback = p_cback;

    mask = BTA_AR_AV_MASK;

  } else if (sys_id == BTA_ID_AVK) {

    bta_ar_cb.p_avk_conn_cback = p_cback;

    mask = BTA_AR_AVK_MASK;

  } else {

    APPL_TRACE_ERROR("%s: the registration is from wrong sys_id:%d", __func__,

                     sys_id);
@@ -133,9 +128,6 @@ void bta_ar_dereg_avdt(tBTA_SYS_ID sys_id) { 
  if (sys_id == BTA_ID_AV) {

    bta_ar_cb.p_av_conn_cback = NULL;

    mask = BTA_AR_AV_MASK;

  } else if (sys_id == BTA_ID_AVK) {

    bta_ar_cb.p_avk_conn_cback = NULL;

    mask = BTA_AR_AVK_MASK;

  }

  bta_ar_cb.avdt_registered &= ~mask;
@@ -163,10 +155,6 @@ void bta_ar_avdt_conn(tBTA_SYS_ID sys_id, const RawAddress& bd_addr, 
    if (bta_ar_cb.p_avk_conn_cback) {

      (*bta_ar_cb.p_avk_conn_cback)(0, bd_addr, event, &data, scb_index);

    }

  } else if (sys_id == BTA_ID_AVK) {

    if (bta_ar_cb.p_av_conn_cback) {

      (*bta_ar_cb.p_av_conn_cback)(0, bd_addr, event, &data, scb_index);

    }

  }

}

system/bta/dm/bta_dm_act.cc

+1 −1
Original line number Diff line number Diff line
@@ -2393,7 +2393,7 @@ static void bta_dm_rm_cback(tBTA_SYS_CONN_STATUS status, uint8_t id, 
    }

  }



  if ((BTA_ID_AV == id) || (BTA_ID_AVK == id)) {

  if (BTA_ID_AV == id) {

    if (status == BTA_SYS_CONN_BUSY) {

      if (p_dev) p_dev->info |= BTA_DM_DI_AV_ACTIVE;

      /* AV calls bta_sys_conn_open with the A2DP stream count as app_id */

system/bta/dm/bta_dm_cfg.cc

+0 −1
Original line number Diff line number Diff line
@@ -122,7 +122,6 @@ tBTA_DM_PM_TYPE_QUALIFIER tBTA_DM_PM_CFG 
        {BTA_ID_CG, BTA_ALL_APP_ID, 1},     /* cg resue ct spec table */

        {BTA_ID_DG, BTA_ALL_APP_ID, 2},     /* dg spec table */

        {BTA_ID_AV, BTA_ALL_APP_ID, 4},     /* av spec table */

        {BTA_ID_AVK, BTA_ALL_APP_ID, 13},   /* avk spec table */

        {BTA_ID_FTC, BTA_ALL_APP_ID, 7},    /* ftc spec table */

        {BTA_ID_FTS, BTA_ALL_APP_ID, 8},    /* fts spec table */

        {BTA_ID_HD, BTA_ALL_APP_ID, 3},     /* hd spec table */

system/bta/jv/bta_jv_act.cc

+1 −3
Original line number Diff line number Diff line
@@ -575,9 +575,7 @@ bool bta_jv_check_psm(uint16_t psm) { 


        case AVCT_PSM: /* 0x17 */

        case AVDT_PSM: /* 0x19 */

          if ((!bta_sys_is_register(BTA_ID_AV)) &&

              (!bta_sys_is_register(BTA_ID_AVK)))

            ret = true;

          if (!bta_sys_is_register(BTA_ID_AV)) ret = true;

          break;



        default:

system/bta/sys/bta_sys.h

+0 −1
Original line number Diff line number Diff line
@@ -68,7 +68,6 @@ typedef void(tBTA_SYS_DISABLE)(void); 
#define BTA_ID_ACC 16           /* Advanced Camera Client */

#define BTA_ID_SC 17            /* SIM Card Access server */

#define BTA_ID_AV 18            /* Advanced audio/video */

#define BTA_ID_AVK 19           /* Audio/video sink */

#define BTA_ID_HD 20            /* HID Device */

#define BTA_ID_CG 21            /* Cordless Gateway */

#define BTA_ID_BP 22            /* Basic Printing Client */