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

Commit dc27cf62 authored by Zach Johnson's avatar Zach Johnson
Browse files

Remove sys id param from bta_ar_reg_avdt 

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ia0ead371d73a289f773d560a6b1125074f6e1343
parent 3028b207

system/bta/ar/bta_ar.cc

+7 −19
Original line number Diff line number Diff line
@@ -70,27 +70,15 @@ static void bta_ar_avdt_cback(uint8_t handle, const RawAddress& bd_addr, 
 * Returns          void

 *

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

void bta_ar_reg_avdt(AvdtpRcb* p_reg, tAVDT_CTRL_CBACK* p_cback,

                     tBTA_SYS_ID sys_id) {

  uint8_t mask = 0;



  if (sys_id == BTA_ID_AV) {

void bta_ar_reg_avdt(AvdtpRcb* p_reg, tAVDT_CTRL_CBACK* p_cback) {

  bta_ar_cb.p_av_conn_cback = p_cback;

    mask = BTA_AR_AV_MASK;

  } else {

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

                     sys_id);

  }



  if (mask) {

  if (bta_ar_cb.avdt_registered == 0) {

    AVDT_Register(p_reg, bta_ar_avdt_cback);

  } else {

      APPL_TRACE_WARNING("%s: sys_id:%d doesn't register again (registered:%d)",

                         __func__, sys_id, bta_ar_cb.avdt_registered);

    }

    bta_ar_cb.avdt_registered |= mask;

    APPL_TRACE_WARNING("%s: doesn't register again (registered:%d)", __func__,

                       bta_ar_cb.avdt_registered);

  }

  bta_ar_cb.avdt_registered |= BTA_AR_AV_MASK;

}



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

system/bta/av/bta_av_main.cc

+1 −1
Original line number Diff line number Diff line
@@ -560,7 +560,7 @@ static void bta_av_api_register(tBTA_AV_DATA* p_data) { 
      reg.idle_tout = BTA_AV_IDLE_TOUT;

      reg.sec_mask = BTA_SEC_AUTHENTICATE;

      reg.scb_index = p_scb->hdi;

      bta_ar_reg_avdt(&reg, bta_av_conn_cback, BTA_ID_AV);

      bta_ar_reg_avdt(&reg, bta_av_conn_cback);

      bta_sys_role_chg_register(&bta_av_sys_rs_cback);



      /* create remote control TG service if required */

system/bta/include/bta_ar_api.h

+1 −2
Original line number Diff line number Diff line
@@ -60,8 +60,7 @@ extern void bta_ar_init(void); 
 * Returns          void

 *

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

extern void bta_ar_reg_avdt(AvdtpRcb* p_reg, tAVDT_CTRL_CBACK* p_cback,

                            tBTA_SYS_ID sys_id);

extern void bta_ar_reg_avdt(AvdtpRcb* p_reg, tAVDT_CTRL_CBACK* p_cback);



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

 *