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

Commit 10817b44 authored by Zach Johnson's avatar Zach Johnson
Browse files

Flatten avdt sec_mask 

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I12ce8b9ca03e4a35a13ad2728583f5b33053f240
parent 49000f15

system/bta/av/bta_av_main.cc

+0 −1
Original line number Diff line number Diff line
@@ -558,7 +558,6 @@ static void bta_av_api_register(tBTA_AV_DATA* p_data) { 
      reg.ret_tout = BTA_AV_RET_TOUT;

      reg.sig_tout = BTA_AV_SIG_TOUT;

      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_sys_role_chg_register(&bta_av_sys_rs_cback);

system/stack/avdt/avdt_api.cc

+2 −2
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include "avdtc_api.h"

#include "bt_target.h"

#include "bt_types.h"

#include "bta/include/bta_api.h"

#include "btm_api.h"

#include "btu.h"

#include "l2c_api.h"
@@ -93,7 +94,7 @@ void AVDT_Register(AvdtpRcb* p_reg, tAVDT_CTRL_CBACK* p_cback) { 
  /* register PSM with L2CAP */

  L2CA_Register2(AVDT_PSM, (tL2CAP_APPL_INFO*)&avdt_l2c_appl,

                 true /* enable_snoop */, nullptr, L2CAP_DEFAULT_MTU,

                 p_reg->sec_mask);

                 BTA_SEC_AUTHENTICATE);



  /* initialize AVDTP data structures */

  avdt_scb_init();
@@ -1210,7 +1211,6 @@ void stack_debug_avdtp_api_dump(int fd) { 
  dprintf(fd, "\nAVDTP Stack State:\n");

  dprintf(fd, "  AVDTP signalling L2CAP channel MTU: %d\n",

          avdtp_cb.rcb.ctrl_mtu);

  dprintf(fd, "  Security mask: 0x%x\n", avdtp_cb.rcb.sec_mask);



  for (size_t i = 0; i < AVDT_NUM_LINKS; i++) {

    const AvdtpCcb& ccb = avdtp_cb.ccb[i];

system/stack/include/avdt_api.h

+0 −3
Original line number Diff line number Diff line
@@ -277,7 +277,6 @@ class AvdtpRcb { 
        ret_tout(0),

        sig_tout(0),

        idle_tout(0),

        sec_mask(0),

        scb_index(0) {}

  AvdtpRcb& operator=(const AvdtpRcb&) = default;
@@ -286,7 +285,6 @@ class AvdtpRcb { 
    ret_tout = 0;

    sig_tout = 0;

    idle_tout = 0;

    sec_mask = 0;

    scb_index = 0;

  }
@@ -294,7 +292,6 @@ class AvdtpRcb { 
  uint8_t ret_tout;  /* AVDTP signaling retransmission timeout */

  uint8_t sig_tout;  /* AVDTP signaling message timeout */

  uint8_t idle_tout; /* AVDTP idle signaling channel timeout */

  uint8_t sec_mask;  /* Security mask for BTM_SetSecurityLevel() */

  uint8_t scb_index; /* The Stream Control Block index */

};