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

Commit 166aa2d1 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes Id30b0dc4,I27168e1f,Id6a4d6e2,I9c011afa,I5a19a21c, ... 

* changes:
  Fold security level calls into hidd_conn_reg
  Fold HID_DevSetSecurityLevel into device registration
  Fold security level into HID_DevSetSecurityLevel
  Fold security mask into AVCT_Register
  Remove sys id param from bta_ar_dereg_avdt
  Remove sys id param from bta_ar_reg_avdt
parents e675e190 afc7a799

system/bta/ar/bta_ar.cc

+11 −28
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;

}



/*******************************************************************************
@@ -102,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();

}
@@ -141,7 +124,7 @@ void bta_ar_avdt_conn(tBTA_SYS_ID sys_id, const RawAddress& bd_addr, 
 ******************************************************************************/

void bta_ar_reg_avct(uint16_t mtu, uint16_t mtu_br) {

  if (bta_ar_cb.avct_registered == 0) {

    AVCT_Register(mtu, mtu_br, BTA_SEC_AUTHENTICATE);

    AVCT_Register(mtu, mtu_br);

  }

  bta_ar_cb.avct_registered |= BTA_AR_AV_MASK;

}

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

+2 −2
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);
@@ -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/hd/bta_hd_act.cc

+0 −2
Original line number Diff line number Diff line
@@ -91,8 +91,6 @@ void bta_hd_api_enable(tBTA_HD_DATA* p_data) { 


  memset(&bta_hd_cb, 0, sizeof(tBTA_HD_CB));



  HID_DevSetSecurityLevel(BTA_SEC_AUTHENTICATE | BTA_SEC_ENCRYPT);



  /* store parameters */

  bta_hd_cb.p_cback = p_data->api_enable.p_cback;

system/bta/include/bta_ar_api.h

+2 −3
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);



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

 *
@@ -72,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();



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

 *