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

Commit 9a4144bf authored by Jack He's avatar Jack He Committed by Automerger Merge Worker
Browse files

Merge "Ensure address removed from filter accept list" am: e09f47cf am:... 

Merge "Ensure address removed from filter accept list" am: e09f47cf am: 93476c7a am: 81fe2cee am: c48387ed am: 4155d57e

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



Change-Id: I9325884308bd6ac91fb64dfc28cb0dc2df5ce211
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 73edd24a 4155d57e

system/stack/gatt/gatt_utils.cc

+20 −3
Original line number Diff line number Diff line
@@ -1406,7 +1406,12 @@ void gatt_sr_update_prep_cnt(tGATT_TCB& tcb, tGATT_IF gatt_if, bool is_inc, 
/** Cancel LE Create Connection request */

bool gatt_cancel_open(tGATT_IF gatt_if, const RawAddress& bda) {

  tGATT_TCB* p_tcb = gatt_find_tcb_by_addr(bda, BT_TRANSPORT_LE);

  if (!p_tcb) return true;

  if (!p_tcb) {

    LOG_WARN(

        "Unable to cancel open for unknown connection gatt_if:%hhu peer:%s",

        gatt_if, PRIVATE_ADDRESS(bda));

    return true;

  }



  if (gatt_get_ch_state(p_tcb) == GATT_CH_OPEN) {

    LOG(ERROR) << __func__ << ": link connected Too late to cancel";
@@ -1415,9 +1420,21 @@ bool gatt_cancel_open(tGATT_IF gatt_if, const RawAddress& bda) { 


  gatt_update_app_use_link_flag(gatt_if, p_tcb, false, false);



  if (p_tcb->app_hold_link.empty()) gatt_disconnect(p_tcb);

  if (p_tcb->app_hold_link.empty()) {

    LOG_DEBUG(

        "Client reference count is zero disconnecting device gatt_if:%hhu "

        "peer:%s",

        gatt_if, PRIVATE_ADDRESS(bda));

    gatt_disconnect(p_tcb);

  }



  connection_manager::direct_connect_remove(gatt_if, bda);

  if (!connection_manager::direct_connect_remove(gatt_if, bda)) {

    BTM_AcceptlistRemove(bda);

    LOG_INFO(

        "GATT connection manager has no record but removed filter acceptlist "

        "gatt_if:%hhu peer:%s",

        gatt_if, PRIVATE_ADDRESS(bda));

  }

  return true;

}