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

Commit 29b41676 authored by Venkata Jagadeesh Garaga's avatar Venkata Jagadeesh Garaga Committed by android-build-merger
Browse files

Merge "GAP: Dont send RNR and create connection at the same time" 

am: eb0c730c

Change-Id: Ie20c933117db79a4bafbd4a1130e51b18964f642
parents 35ec7ced eb0c730c

system/stack/btm/btm_acl.cc

+1 −1
Original line number Diff line number Diff line
@@ -2607,7 +2607,7 @@ void btm_acl_paging(BT_HDR* p, const RawAddress& bda) { 
  } else {

    if (!BTM_ACL_IS_CONNECTED(bda)) {

      VLOG(1) << "connecting_bda: " << btm_cb.connecting_bda;

      if (btm_cb.paging && bda != btm_cb.connecting_bda) {

      if (btm_cb.paging && bda == btm_cb.connecting_bda) {

        fixed_queue_enqueue(btm_cb.page_queue, p);

      } else {

        p_dev_rec = btm_find_or_alloc_dev(bda);