Merge c8523f5c9dfc0d3cf2f3ecc3c7f89326733fb276 on remote branch

Change-Id: Ibd4beb7c71dd436610071aff26ccde92e237dfbd

1 files changed, 0 insertions, 15 deletions

diff --git a/system/stack/gatt/connection_manager.cc b/system/stack/gatt/connection_manager.cc
index c6052c236c..fd38bb5e05 100644
--- a/system/stack/gatt/connection_manager.cc
+++ b/system/stack/gatt/connection_manager.cc
@@ -149,21 +149,6 @@ bool remove_unconditional(const RawAddress& address) {
   return true;
 }
 
-/** Removes the registrations for connection for given device.
- * but does not change the controller acceptlist.  Used for
- * shim purposes.
- * Returns true if anything was removed, false otherwise */
-bool remove_unconditional_from_shim(const RawAddress& address) {
-  LOG_DEBUG("address=%s", address.ToString().c_str());
-  auto it = bgconn_dev.find(address);
-  if (it == bgconn_dev.end()) {
-    LOG_WARN("address %s is not found", address.ToString().c_str());
-    return false;
-  }
-  bgconn_dev.erase(it);
-  return true;
-}
-
 /** Remove device from the background connection device list or listening to
  * advertising list.  Returns true if device was on the list and was
  * successfully removed */