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

Commit 32b0f8c2 authored by Hansong Zhang's avatar Hansong Zhang Committed by android-build-merger
Browse files

Merge "L2CAP: Delete callbacks from queue after use" am: 19623b6c 

am: c3948d36

Change-Id: Ie0ff52fb3ebd001c47fc2753d995bcb7ed45651a
parents 17d08d51 c3948d36

system/gd/l2cap/classic/internal/link_manager.cc

+1 −1
Original line number Diff line number Diff line
@@ -133,8 +133,8 @@ void LinkManager::OnConnectSuccess(std::unique_ptr<hci::AclConnection> acl_conne 
  if (pending_dynamic_channels_.find(device) != pending_dynamic_channels_.end()) {

    for (Psm psm : pending_dynamic_channels_[device]) {

      auto& callbacks = pending_dynamic_channels_callbacks_[device].front();

      pending_dynamic_channels_callbacks_[device].pop_front();

      link->SendConnectionRequest(psm, link->ReserveDynamicChannel(), std::move(callbacks));

      pending_dynamic_channels_callbacks_[device].pop_front();

    }

    pending_dynamic_channels_.erase(device);

    pending_dynamic_channels_callbacks_.erase(device);