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

Commit 1fa539ec authored by Zach Johnson's avatar Zach Johnson
Browse files

Remove sys id param from bta_ar_dereg_avdt 

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I5a19a21cc54b11b140fa1eea93767a94aa7f320f
parent dc27cf62

system/bta/ar/bta_ar.cc

+3 −8
Original line number Diff line number Diff line
@@ -90,14 +90,9 @@ void bta_ar_reg_avdt(AvdtpRcb* p_reg, tAVDT_CTRL_CBACK* p_cback) { 
 * Returns          void

 *

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

void bta_ar_dereg_avdt(tBTA_SYS_ID sys_id) {

  uint8_t mask = 0;



  if (sys_id == BTA_ID_AV) {

void bta_ar_dereg_avdt() {

  bta_ar_cb.p_av_conn_cback = NULL;

    mask = BTA_AR_AV_MASK;

  }

  bta_ar_cb.avdt_registered &= ~mask;

  bta_ar_cb.avdt_registered &= ~BTA_AR_AV_MASK;



  if (bta_ar_cb.avdt_registered == 0) AVDT_Deregister();

}

system/bta/av/bta_av_act.cc

+1 −1
Original line number Diff line number Diff line
@@ -2292,7 +2292,7 @@ void bta_av_dereg_comp(tBTA_AV_DATA* p_data) { 
  /* if no stream control block is active */

  if (p_cb->reg_audio == 0) {

    /* deregister from AVDT */

    bta_ar_dereg_avdt(BTA_ID_AV);

    bta_ar_dereg_avdt();



    /* deregister from AVCT */

    bta_ar_dereg_avrc(UUID_SERVCLASS_AV_REM_CTRL_TARGET);

system/bta/av/bta_av_main.cc

+1 −1
Original line number Diff line number Diff line
@@ -240,7 +240,7 @@ static void bta_av_api_enable(tBTA_AV_DATA* p_data) { 
    }

#endif

    // deregister from AVDT

    bta_ar_dereg_avdt(BTA_ID_AV);

    bta_ar_dereg_avdt();



    // deregister from AVCT

    bta_ar_dereg_avrc(UUID_SERVCLASS_AV_REMOTE_CONTROL);

system/bta/include/bta_ar_api.h

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ extern void bta_ar_reg_avdt(AvdtpRcb* p_reg, tAVDT_CTRL_CBACK* p_cback); 
 * Returns          void

 *

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

extern void bta_ar_dereg_avdt(tBTA_SYS_ID sys_id);

extern void bta_ar_dereg_avdt();



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

 *