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

Commit a7ef04a3 authored by Kyunglyul Hyun's avatar Kyunglyul Hyun Committed by Automerger Merge Worker
Browse files

Merge "Check rcb is released" into main am: 85028554 am: 5e543fe6 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3341466



Change-Id: I34424b66e2c5fd91af653a03715e48acd42686bd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1adb35c5 5e543fe6

system/stack/gatt/gatt_utils.cc

+5 −3
Original line number Diff line number Diff line
@@ -1752,11 +1752,13 @@ bool gatt_is_outstanding_msg_in_att_send_queue(const tGATT_TCB& tcb) { 
 ******************************************************************************/

void gatt_end_operation(tGATT_CLCB* p_clcb, tGATT_STATUS status, void* p_data) {

  tGATT_CL_COMPLETE cb_data;

  tGATT_CMPL_CBACK* p_cmpl_cb = (p_clcb->p_reg) ? p_clcb->p_reg->app_cb.p_cmpl_cb : NULL;

  tGATT_REG* p_reg = gatt_get_regcb(gatt_get_gatt_if(p_clcb->conn_id));

  tGATT_CMPL_CBACK* p_cmpl_cb =

          ((p_clcb->p_reg == p_reg) && p_reg) ? p_reg->app_cb.p_cmpl_cb : NULL;

  tGATT_DISC_CMPL_CB* p_disc_cmpl_cb =

          ((p_clcb->p_reg == p_reg) && p_reg) ? p_clcb->p_reg->app_cb.p_disc_cmpl_cb : NULL;

  tGATTC_OPTYPE op = p_clcb->operation;

  tGATT_DISC_TYPE disc_type = GATT_DISC_MAX;

  tGATT_DISC_CMPL_CB* p_disc_cmpl_cb =

          (p_clcb->p_reg) ? p_clcb->p_reg->app_cb.p_disc_cmpl_cb : NULL;

  tCONN_ID conn_id;

  uint8_t operation;