From: Hansong Zhang <hsz@google.com>
Date: Tue, 17 Nov 2020 23:05:15 +0000 (-0800)
Subject: Hci layer: Minor clean up
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=96ed87bb6af12c60c99dbcc787acb11f9c6f023e;p=android-x86%2Fsystem-bt.git

Hci layer: Minor clean up

Tag: #gd-refactor
Bug: 141555841
Test: cert/run --host
Change-Id: I5498e56285a6523d0ce3199777c5677e9fdf6bbc
---

diff --git a/gd/hci/hci_layer.cc b/gd/hci/hci_layer.cc
index 176177763..6ccaf1434 100644
--- a/gd/hci/hci_layer.cc
+++ b/gd/hci/hci_layer.cc
@@ -182,7 +182,7 @@ struct HciLayer::impl {
   }
 
   void unregister_event(EventCode event) {
-    event_handlers_.erase(event_handlers_.find(event));
+    event_handlers_.erase(event);
   }
 
   void register_le_meta_event(ContextualCallback<void(EventPacketView)> handler) {
@@ -421,7 +421,7 @@ void HciLayer::Start() {
   RegisterEventHandler(EventCode::COMMAND_COMPLETE, handler->BindOn(impl_, &impl::on_command_complete));
   RegisterEventHandler(EventCode::COMMAND_STATUS, handler->BindOn(impl_, &impl::on_command_status));
   RegisterLeMetaEventHandler(handler->BindOn(impl_, &impl::on_le_meta_event));
-  if (bluetooth::common::InitFlags::GdAclEnabled()) {
+  if (bluetooth::common::InitFlags::GdAclEnabled() || bluetooth::common::InitFlags::GdL2capEnabled()) {
     RegisterEventHandler(
         EventCode::DISCONNECTION_COMPLETE, handler->BindOn(this, &HciLayer::on_disconnection_complete));
     RegisterEventHandler(