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

Commit 394d7446 authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

Plumb through ClearConnectList am: 0bfde89d am: 0f246706 

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

Change-Id: Ifd682cc1d760ab38ef5cd84dd482cbe980f37998
parents 3432b4ab 0f246706

system/gd/hci/acl_manager.cc

+4 −0
Original line number Diff line number Diff line
@@ -224,6 +224,10 @@ void AclManager::RemoveDeviceFromConnectList(AddressWithType address_with_type) 
  CallOn(pimpl_->le_impl_, &le_impl::remove_device_from_connect_list, address_with_type);

}



void AclManager::ClearConnectList() {

  CallOn(pimpl_->le_impl_, &le_impl::clear_connect_list);

}



void AclManager::AddDeviceToResolvingList(

    AddressWithType address_with_type,

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

system/gd/hci/acl_manager.h

+2 −0
Original line number Diff line number Diff line
@@ -102,6 +102,8 @@ public: 
 virtual void CancelLeConnect(AddressWithType address_with_type);

 virtual void AddDeviceToConnectList(AddressWithType address_with_type);

 virtual void RemoveDeviceFromConnectList(AddressWithType address_with_type);

 virtual void ClearConnectList();



 virtual void AddDeviceToResolvingList(

     AddressWithType address_with_type,

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

system/gd/hci/acl_manager/le_impl.h

+9 −0
Original line number Diff line number Diff line
@@ -397,6 +397,15 @@ struct le_impl : public bluetooth::hci::LeAddressManagerCallback { 
    }

  }



  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 add_device_to_resolving_list(

      AddressWithType address_with_type,

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