commit f0519cde8bee5d6013ea709fde67a18ccd5a094d
author Treehugger Robot <treehugger-gerrit@google.com> Sat Nov 16 05:38:30 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Nov 16 05:38:30 2019 +0000
tree fc91cd59bf3f4fc053c26730d849540a54f0ef35
parent 70fe6e2293b5bdffa2053a3644aa9d3840a71c2a
parent 517f77056b8d5ee20ec7fb46b6e40e8d5bb9683d

Merge "L2CAP: Delete callbacks from queue after use"

gd/l2cap/classic/internal/link_manager.cc

diff --git a/gd/l2cap/classic/internal/link_manager.cc b/gd/l2cap/classic/internal/link_manager.cc
index d9961c2..ee93fd7 100644
--- a/gd/l2cap/classic/internal/link_manager.cc
+++ b/gd/l2cap/classic/internal/link_manager.cc
@@ -133,8 +133,8 @@
   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);