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

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

Remove sys id param from bta_ar_dereg_avct 

it's always the same

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

system/bta/ar/bta_ar.cc

+2 −4
Original line number Diff line number Diff line
@@ -173,10 +173,8 @@ void bta_ar_reg_avct(uint16_t mtu, uint16_t mtu_br) { 
 * Returns          void

 *

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

void bta_ar_dereg_avct(tBTA_SYS_ID sys_id) {

  uint8_t mask = bta_ar_id(sys_id);



  bta_ar_cb.avct_registered &= ~mask;

void bta_ar_dereg_avct() {

  bta_ar_cb.avct_registered &= ~BTA_AR_AV_MASK;



  if (bta_ar_cb.avct_registered == 0) AVCT_Deregister();

}

system/bta/av/bta_av_act.cc

+1 −1
Original line number Diff line number Diff line
@@ -2296,7 +2296,7 @@ void bta_av_dereg_comp(tBTA_AV_DATA* p_data) { 


    /* deregister from AVCT */

    bta_ar_dereg_avrc(UUID_SERVCLASS_AV_REM_CTRL_TARGET, BTA_ID_AV);

    bta_ar_dereg_avct(BTA_ID_AV);

    bta_ar_dereg_avct();



    if (p_cb->disabling) {

      p_cb->disabling = false;

system/bta/av/bta_av_main.cc

+1 −1
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ static void bta_av_api_enable(tBTA_AV_DATA* p_data) { 
    // deregister from AVCT

    bta_ar_dereg_avrc(UUID_SERVCLASS_AV_REMOTE_CONTROL, BTA_ID_AV);

    bta_ar_dereg_avrc(UUID_SERVCLASS_AV_REM_CTRL_TARGET, BTA_ID_AV);

    bta_ar_dereg_avct(BTA_ID_AV);

    bta_ar_dereg_avct();

  }



  /* initialize control block */

system/bta/include/bta_ar_api.h

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ extern void bta_ar_reg_avct(uint16_t mtu, uint16_t mtu_br); 
 * Returns          void

 *

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

extern void bta_ar_dereg_avct(tBTA_SYS_ID sys_id);

extern void bta_ar_dereg_avct();



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

 *