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

Commit 560b2905 authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

Use proper gatt_notify_conn_update::status type at corresponding level am: 97302282 

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

Change-Id: Ib22fc5dd35634f4e03ad3c32e5db89c9d3b1c68b
parents 928f7767 97302282

system/stack/btu/btu_hcif.cc

+2 −2
Original line number Diff line number Diff line
@@ -1704,7 +1704,7 @@ static void btu_hcif_encryption_key_refresh_cmpl_evt(uint8_t* p) { 


extern void gatt_notify_conn_update(uint16_t handle, uint16_t interval,

                                    uint16_t latency, uint16_t timeout,

                                    tGATT_STATUS status);

                                    tHCI_STATUS status);



static void btu_ble_ll_conn_param_upd_evt(uint8_t* p, uint16_t evt_len) {

  /* LE connection update has completed successfully as a central. */
@@ -1725,7 +1725,7 @@ static void btu_ble_ll_conn_param_upd_evt(uint8_t* p, uint16_t evt_len) { 
  l2cble_process_conn_update_evt(handle, status, interval, latency, timeout);



  gatt_notify_conn_update(handle & 0x0FFF, interval, latency, timeout,

                          static_cast<tGATT_STATUS>(status));

                          static_cast<tHCI_STATUS>(status));

}



static void btu_ble_proc_ltk_req(uint8_t* p) {

system/stack/gatt/gatt_main.cc

+3 −2
Original line number Diff line number Diff line
@@ -502,7 +502,7 @@ void gatt_notify_phy_updated(tGATT_STATUS status, uint16_t handle, 


void gatt_notify_conn_update(uint16_t handle, uint16_t interval,

                             uint16_t latency, uint16_t timeout,

                             tGATT_STATUS status) {

                             tHCI_STATUS status) {

  tBTM_SEC_DEV_REC* p_dev_rec = btm_find_dev_by_handle(handle);

  if (!p_dev_rec) return;
@@ -515,7 +515,8 @@ void gatt_notify_conn_update(uint16_t handle, uint16_t interval, 
    if (p_reg->in_use && p_reg->app_cb.p_conn_update_cb) {

      uint16_t conn_id = GATT_CREATE_CONN_ID(p_tcb->tcb_idx, p_reg->gatt_if);

      (*p_reg->app_cb.p_conn_update_cb)(p_reg->gatt_if, conn_id, interval,

                                        latency, timeout, status);

                                        latency, timeout,

                                        static_cast<tGATT_STATUS>(status));

    }

  }

}