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

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

GATT: Fix data length parameter am: 83db2d68 am: 78ce165a am: 0399f7ee 

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

Change-Id: Ic911a8cc930efc50c76a4a4f19ea118ef99b99ce
parents ca8bef48 0399f7ee

system/stack/gatt/gatt_cl.cc

+3 −1
Original line number Diff line number Diff line
@@ -47,6 +47,8 @@ 
#define GATT_MTU_RSP_MIN_LEN 2

#define GATT_READ_BY_TYPE_RSP_MIN_LEN 1



#define L2CAP_PKT_OVERHEAD 4



using base::StringPrintf;

using bluetooth::Uuid;

using bluetooth::eatt::EattExtension;
@@ -1095,7 +1097,7 @@ void gatt_process_mtu_rsp(tGATT_TCB& tcb, tGATT_CLCB* p_clcb, uint16_t len, 
      tcb.payload_size = mtu;

  }



  BTM_SetBleDataLength(tcb.peer_bda, tcb.payload_size);

  BTM_SetBleDataLength(tcb.peer_bda, tcb.payload_size + L2CAP_PKT_OVERHEAD);



  gatt_end_operation(p_clcb, status, NULL);

}

system/stack/gatt/gatt_sr.cc

+2 −1
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#include "stack/eatt/eatt.h"

#include "stack/l2cap/l2c_int.h"

#define GATT_MTU_REQ_MIN_LEN 2

#define L2CAP_PKT_OVERHEAD 4



using base::StringPrintf;

using bluetooth::Uuid;
@@ -816,7 +817,7 @@ static void gatts_process_mtu_req(tGATT_TCB& tcb, uint16_t cid, uint16_t len, 


  LOG(INFO) << "MTU request PDU with MTU size " << +tcb.payload_size;



  BTM_SetBleDataLength(tcb.peer_bda, tcb.payload_size);

  BTM_SetBleDataLength(tcb.peer_bda, tcb.payload_size + L2CAP_PKT_OVERHEAD);



  tGATT_SR_MSG gatt_sr_msg;

  gatt_sr_msg.mtu = tcb.payload_size;