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

Commit 86a8b755 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revert "GATT: Unregister notifications when disconnecting"" am:... 

Merge "Revert "GATT: Unregister notifications when disconnecting"" am: f4054a26 am: e7b6cdf7 am: 5bfd8e1a am: 93625f9f am: a71ab744

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



Change-Id: Ia3af2d32971ef192e0cf2106f9e266d4a2c35047
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b96fbf07 a71ab744

system/bta/gatt/bta_gattc_act.cc

+0 −8
Original line number Original line Diff line number Diff line
@@ -604,14 +604,6 @@ void bta_gattc_close(tBTA_GATTC_CLCB* p_clcb, const tBTA_GATTC_DATA* p_data) { 
    bta_sys_conn_close(BTA_ID_GATTC, BTA_ALL_APP_ID, p_clcb->bda);

    bta_sys_conn_close(BTA_ID_GATTC, BTA_ALL_APP_ID, p_clcb->bda);

  }

  }





  /* Clean up notification registration for closed client */

  for (int i = 0; i < BTA_GATTC_NOTIF_REG_MAX; i++) {

    if (p_clreg->notif_reg[i].in_use &&

        p_clreg->notif_reg[i].remote_bda == p_clcb->bda) {

      p_clreg->notif_reg[i] = {};

    }

  }



  bta_gattc_clcb_dealloc(p_clcb);

  bta_gattc_clcb_dealloc(p_clcb);





  if (p_data->hdr.event == BTA_GATTC_API_CLOSE_EVT) {

  if (p_data->hdr.event == BTA_GATTC_API_CLOSE_EVT) {