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

Commit 16b4e991 authored by Chris Manton's avatar Chris Manton
Browse files

Ensure repeated connections are captured 

std::map::emplace does not replace existing value if the key
already exists.

The newly constructed element will be destroyed immediately
if there already is an element with the key in the container.

Bug: 235872679
Tag: #test
Test: gd/cert/run --sl4a --clean

Change-Id: I340b723e805c0b94128bf6665690571f09dc9529
parent f263f853

system/gd/hci/facade/le_acl_manager_facade.cc

+5 −1
Original line number Original line Diff line number Diff line
@@ -269,7 +269,11 @@ class LeAclManagerFacadeService : public LeAclManagerFacade::Service, public LeC 
    auto role = shared_connection->GetRole();

    auto role = shared_connection->GetRole();

    if (role == Role::PERIPHERAL) {

    if (role == Role::PERIPHERAL) {

      ASSERT(incoming_connection_events_ != nullptr);

      ASSERT(incoming_connection_events_ != nullptr);

      if (per_connection_events_.find(peer) == per_connection_events_.end()) {

        per_connection_events_.emplace(peer, incoming_connection_events_);

        per_connection_events_.emplace(peer, incoming_connection_events_);

      } else {

        per_connection_events_[peer] = incoming_connection_events_;

      }

      incoming_connection_events_.reset();

      incoming_connection_events_.reset();

    } else if (direct_connection_address_ == peer) {

    } else if (direct_connection_address_ == peer) {

      direct_connection_address_ = AddressWithType();

      direct_connection_address_ = AddressWithType();