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

Commit 5cf3b7a8 authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

le_impl: Co-locate add/remove_device_from_connect_list am: c162485d 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/1897277

Change-Id: I376c11931a01ea7b988f47cc6a38a0c53f95cf5b
parents d9d8e002 c162485d

system/gd/hci/acl_manager/le_impl.h

+22 −22
Original line number Diff line number Diff line
@@ -404,6 +404,28 @@ struct le_impl : public bluetooth::hci::LeAddressManagerCallback { 
    le_address_manager_->ClearConnectList();

  }



  void remove_device_from_connect_list(AddressWithType address_with_type) {

    AddressType address_type = address_with_type.GetAddressType();

    direct_connections_.erase(address_with_type);

    if (!address_manager_registered) {

      le_address_manager_->Register(this);

      address_manager_registered = true;

    }

    pause_connection = true;

    switch (address_type) {

      case AddressType::PUBLIC_DEVICE_ADDRESS:

      case AddressType::PUBLIC_IDENTITY_ADDRESS: {

        le_address_manager_->RemoveDeviceFromConnectList(

            ConnectListAddressType::PUBLIC, address_with_type.GetAddress());

      } break;

      case AddressType::RANDOM_DEVICE_ADDRESS:

      case AddressType::RANDOM_IDENTITY_ADDRESS: {

        le_address_manager_->RemoveDeviceFromConnectList(

            ConnectListAddressType::RANDOM, address_with_type.GetAddress());

      }

    }

  }



  void add_device_to_resolving_list(

      AddressWithType address_with_type,

      const std::array<uint8_t, 16>& peer_irk,
@@ -592,28 +614,6 @@ struct le_impl : public bluetooth::hci::LeAddressManagerCallback { 
        std::move(packet), handler_->BindOnce([](CommandCompleteView complete) {}));

  }



  void remove_device_from_connect_list(AddressWithType address_with_type) {

    AddressType address_type = address_with_type.GetAddressType();

    direct_connections_.erase(address_with_type);

    if (!address_manager_registered) {

      le_address_manager_->Register(this);

      address_manager_registered = true;

    }

    pause_connection = true;

    switch (address_type) {

      case AddressType::PUBLIC_DEVICE_ADDRESS:

      case AddressType::PUBLIC_IDENTITY_ADDRESS: {

        le_address_manager_->RemoveDeviceFromConnectList(

            ConnectListAddressType::PUBLIC, address_with_type.GetAddress());

      } break;

      case AddressType::RANDOM_DEVICE_ADDRESS:

      case AddressType::RANDOM_IDENTITY_ADDRESS: {

        le_address_manager_->RemoveDeviceFromConnectList(

            ConnectListAddressType::RANDOM, address_with_type.GetAddress());

      }

    }

  }



  void remove_device_from_resolving_list(AddressWithType address_with_type) {

    AddressType address_type = address_with_type.GetAddressType();

    if (!address_manager_registered) {