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

Commit 7fdb216a authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

Combine decl/defs bta/hh/bta_hh_le::bta_hh_gatt_close am: 07c17151 am: 8ba18ca4 am: 1ad68451 

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

Change-Id: I4aef94524aaec81a225c0d02c1f253ba7dab25f4
parents acf38962 1ad68451

system/bta/hh/bta_hh_le.cc

+4 −4
Original line number Diff line number Diff line
@@ -1607,7 +1607,6 @@ void bta_hh_le_open_fail(tBTA_HH_DEV_CB* p_cb, const tBTA_HH_DATA* p_data) { 
 *

 ******************************************************************************/

void bta_hh_gatt_close(tBTA_HH_DEV_CB* p_cb, const tBTA_HH_DATA* p_data) {

  tBTA_HH_CBDATA disc_dat = {BTA_HH_OK, 0};



  /* deregister all notification */

  bta_hh_le_deregister_input_notif(p_cb);
@@ -1616,9 +1615,10 @@ void bta_hh_gatt_close(tBTA_HH_DEV_CB* p_cb, const tBTA_HH_DATA* p_data) { 
  /* update total conn number */

  bta_hh_cb.cnt_num--;



  disc_dat.handle = p_cb->hid_handle;

  disc_dat.status = p_cb->status;



  tBTA_HH_CBDATA disc_dat = {

      .status = p_cb->status,

      .handle = p_cb->hid_handle,

  };

  (*bta_hh_cb.p_cback)(BTA_HH_CLOSE_EVT, (tBTA_HH*)&disc_dat);



  /* if no connection is active and HH disable is signaled, disable service */