Merge "LE ACL: Expose Connection Update API to L2CAP"
diff --git a/gd/security/internal/security_manager_impl.cc b/gd/security/internal/security_manager_impl.cc
index cfda51f..26bd493 100644
--- a/gd/security/internal/security_manager_impl.cc
+++ b/gd/security/internal/security_manager_impl.cc
@@ -202,7 +202,7 @@
       HandleEvent(hci::RemoteOobDataRequestView::Create(event));
       break;
     case hci::EventCode::USER_PASSKEY_NOTIFICATION:
-      HandleEvent<hci::UserPasskeyNotificationView>(hci::UserPasskeyNotificationView::Create(event));
+      HandleEvent(hci::UserPasskeyNotificationView::Create(event));
       break;
     case hci::EventCode::KEYPRESS_NOTIFICATION:
       HandleEvent(hci::KeypressNotificationView::Create(event));
diff --git a/gd/security/ui.h b/gd/security/ui.h
index 83041de..abb943e 100644
--- a/gd/security/ui.h
+++ b/gd/security/ui.h
@@ -20,6 +20,9 @@
 
 #include "hci/address_with_type.h"
 
+namespace bluetooth {
+namespace security {
+
 // Through this interface we talk to the user, asking for confirmations/acceptance.
 class UI {
  public:
@@ -56,3 +59,6 @@
   /* User typed the value displayed on the other device. This is either Passkey or the Confirm value */
   virtual void OnPasskeyEntry(const bluetooth::hci::Address& address, uint32_t passkey) = 0;
 };
+
+}  // namespace security
+}  // namespace bluetooth