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

Commit b6c7ca31 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Use common address manager conventions" am: 127696ec 

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

Change-Id: Ide1fd61bc757513569536cb2b2eaa3e0d1d0e04e
parents 7b20aea2 127696ec

system/gd/hci/acl_manager/le_impl.h

+5 −9
Original line number Diff line number Diff line
@@ -452,15 +452,6 @@ struct le_impl : public bluetooth::hci::LeAddressManagerCallback { 
        address_with_type.ToConnectListAddressType(), address_with_type.GetAddress());

  }



  void clear_connect_list() {

    if (!address_manager_registered) {

      le_address_manager_->Register(this);

      address_manager_registered = true;

    }

    pause_connection = true;

    le_address_manager_->ClearConnectList();

  }



  void remove_device_from_connect_list(AddressWithType address_with_type) {

    direct_connections_.erase(address_with_type);

    register_with_address_manager();
@@ -468,6 +459,11 @@ struct le_impl : public bluetooth::hci::LeAddressManagerCallback { 
        address_with_type.ToConnectListAddressType(), address_with_type.GetAddress());

  }



  void clear_connect_list() {

    register_with_address_manager();

    le_address_manager_->ClearConnectList();

  }



  void add_device_to_resolving_list(

      AddressWithType address_with_type,

      const std::array<uint8_t, 16>& peer_irk,