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

Commit 6382cb86 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "L2C: Refactor l2c_link_hci_disc_comp" am: d19a79e6 am: 54761d91 am:... 

Merge "L2C: Refactor l2c_link_hci_disc_comp" am: d19a79e6 am: 54761d91 am: 367c4df4 am: 40d0fa94

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



Change-Id: I755e22e9834993ef066998544e68cb3326366cab
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 944681a5 40d0fa94

system/stack/l2cap/l2c_link.cc

+7 −15
Original line number Diff line number Diff line
@@ -434,26 +434,18 @@ bool l2c_link_hci_disc_comp(uint16_t handle, tHCI_REASON reason) { 
        for (xx = 0; xx < L2CAP_NUM_FIXED_CHNLS; xx++) {

          if (p_lcb->p_fixed_ccbs[xx] &&

              p_lcb->p_fixed_ccbs[xx] != p_lcb->p_pending_ccb) {

            (*l2cb.fixed_reg[xx].pL2CA_FixedConn_Cb)(

                xx + L2CAP_FIRST_FIXED_CHNL, p_lcb->remote_bd_addr, false,

                p_lcb->DisconnectReason(), p_lcb->transport);

            if (p_lcb->p_fixed_ccbs[xx] == NULL) {

              LOG_ERROR(

                  "unexpected p_fixed_ccbs[%d] is NULL remote_bd_addr = %s "

                  "p_lcb = %p in_use = %d link_state = %d handle = %d "

                  "link_role = %d is_bonding = %d disc_reason = %d transport = "

                  "%d",

                  xx, ADDRESS_TO_LOGGABLE_CSTR(p_lcb->remote_bd_addr), p_lcb,

                  p_lcb->in_use, p_lcb->link_state, p_lcb->Handle(),

                  p_lcb->LinkRole(), p_lcb->IsBonding(),

                  p_lcb->DisconnectReason(), p_lcb->transport);

            }

            CHECK(p_lcb->p_fixed_ccbs[xx] != NULL);

            l2cu_release_ccb(p_lcb->p_fixed_ccbs[xx]);



            p_lcb->p_fixed_ccbs[xx] = NULL;

            (*l2cb.fixed_reg[xx].pL2CA_FixedConn_Cb)(

                xx + L2CAP_FIRST_FIXED_CHNL, p_lcb->remote_bd_addr, false,

                p_lcb->DisconnectReason(), p_lcb->transport);

          }

        }

        /* Cleanup connection state to avoid race conditions because

         * l2cu_release_lcb won't be invoked to cleanup */

        btm_acl_removed(p_lcb->Handle());

        p_lcb->InvalidateHandle();

      }

      if (p_lcb->transport == BT_TRANSPORT_LE) {

        if (l2cu_create_conn_le(p_lcb))