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

Commit 426d6d86 authored by Hansong Zhang's avatar Hansong Zhang Committed by Automerger Merge Worker
Browse files

AVDTP: Use the same MTU in config request am: cc5d28a3 

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1437938

Change-Id: I5e3014b2451932a8fde734b13ad840171437835b
parents de8ce9ce cc5d28a3

system/stack/avdt/avdt_ad.cc

+2 −2
Original line number Diff line number Diff line
@@ -527,10 +527,10 @@ void avdt_ad_open_req(uint8_t type, AvdtpCcb* p_ccb, AvdtpScb* p_scb, 


  if (type == AVDT_CHAN_SIG) {

    /* if signaling, get mtu from registration control block */

    p_tbl->my_mtu = kSignalMtu;

    p_tbl->my_mtu = kAvdtpMtu;

  } else {

    /* otherwise get mtu from scb */

    p_tbl->my_mtu = kAudioMtu;

    p_tbl->my_mtu = kAvdtpMtu;



    /* also set scb_hdl in rt_tbl */

    avdtp_cb.ad.rt_tbl[avdt_ccb_to_idx(p_ccb)][p_tbl->tcid].scb_hdl =

system/stack/avdt/avdt_api.cc

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ void avdt_scb_transport_channel_timer_timeout(void* data) { 
void AVDT_Register(AvdtpRcb* p_reg, tAVDT_CTRL_CBACK* p_cback) {

  /* register PSM with L2CAP */

  L2CA_Register2(AVDT_PSM, avdt_l2c_appl, true /* enable_snoop */, nullptr,

                 L2CAP_DEFAULT_MTU, BTA_SEC_AUTHENTICATE);

                 kAvdtpMtu, BTA_SEC_AUTHENTICATE);



  /* initialize AVDTP data structures */

  avdt_scb_init();

system/stack/avdt/avdt_int.h

+1 −2
Original line number Diff line number Diff line
@@ -1002,7 +1002,6 @@ extern const uint8_t avdt_msg_rej_2_evt[]; 


void avdt_l2c_disconnect(uint16_t lcid);



constexpr uint16_t kSignalMtu = 672;

constexpr uint16_t kAudioMtu = MAX_3MBPS_AVDTP_MTU;

constexpr uint16_t kAvdtpMtu = 1024;



#endif /* AVDT_INT_H */

system/stack/avdt/avdt_l2c.cc

+3 −3
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ static void avdt_sec_check_complete_term(const RawAddress* bd_addr, 
    /* Send L2CAP config req */

    memset(&cfg, 0, sizeof(tL2CAP_CFG_INFO));

    cfg.mtu_present = true;

    cfg.mtu = kSignalMtu;

    cfg.mtu = kAvdtpMtu;

    L2CA_ConfigReq(p_tbl->lcid, &cfg);

  } else {

    L2CA_ConnectRsp(*bd_addr, p_tbl->id, p_tbl->lcid, L2CAP_CONN_SECURITY_BLOCK,
@@ -136,7 +136,7 @@ static void avdt_sec_check_complete_orig(const RawAddress* bd_addr, 
    /* Send L2CAP config req */

    memset(&cfg, 0, sizeof(tL2CAP_CFG_INFO));

    cfg.mtu_present = true;

    cfg.mtu = kSignalMtu;

    cfg.mtu = kAvdtpMtu;

    L2CA_ConfigReq(p_tbl->lcid, &cfg);

  } else {

    avdt_l2c_disconnect(p_tbl->lcid);
@@ -177,7 +177,7 @@ void avdt_l2c_connect_ind_cback(const RawAddress& bd_addr, uint16_t lcid, 
    } else {

      /* allocate and set up entry; first channel is always signaling */

      p_tbl = avdt_ad_tc_tbl_alloc(p_ccb);

      p_tbl->my_mtu = kSignalMtu;

      p_tbl->my_mtu = kAvdtpMtu;

      p_tbl->tcid = AVDT_CHAN_SIG;

      p_tbl->lcid = lcid;

      p_tbl->id = id;