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

Commit eeb355b1 authored by Martin Brabham's avatar Martin Brabham
Browse files

Rename ClearAcceptList -> ClearFilterAcceptList in ACL Shim 

Bug: 229047843
Test: mma -j $(nproc)
Test: ./build.py
Tag: #compatibility
Change-Id: Id05613a6552c4b12d42d477768b73f6ad5773841
parent bd6b7be8

system/main/shim/acl.cc

+1 −1
Original line number Diff line number Diff line
@@ -1647,7 +1647,7 @@ void shim::legacy::Acl::FinalShutdown() { 
  LOG_INFO("Unregistered and cleared any orphaned ACL connections");

}



void shim::legacy::Acl::ClearAcceptList() {

void shim::legacy::Acl::ClearFilterAcceptList() {

  handler_->CallOn(pimpl_.get(), &Acl::impl::clear_acceptlist);

}

system/main/shim/acl.h

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ class Acl : public hci::acl_manager::ConnectionCallbacks, 
  void Shutdown();

  void FinalShutdown();



  void ClearAcceptList();

  void ClearFilterAcceptList();



 protected:

  void on_incoming_acl_credits(uint16_t handle, uint16_t credits);

system/main/shim/acl_api.cc

+3 −3
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ void bluetooth::shim::ACL_Shutdown() { 
}



void bluetooth::shim::ACL_IgnoreAllLeConnections() {

  return Stack::GetInstance()->GetAcl()->ClearAcceptList();

  return Stack::GetInstance()->GetAcl()->ClearFilterAcceptList();

}



void bluetooth::shim::ACL_ReadConnectionAddress(const RawAddress& pseudo_addr,
@@ -128,6 +128,6 @@ void bluetooth::shim::ACL_ClearAddressResolution() { 
  Stack::GetInstance()->GetAcl()->ClearAddressResolution();

}



void bluetooth::shim::ACL_ClearAcceptList() {

  Stack::GetInstance()->GetAcl()->ClearAcceptList();

void bluetooth::shim::ACL_ClearFilterAcceptList() {

  Stack::GetInstance()->GetAcl()->ClearFilterAcceptList();

}

system/main/shim/acl_api.h

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ void ACL_AddToAddressResolution(const tBLE_BD_ADDR& legacy_address_with_type, 
void ACL_RemoveFromAddressResolution(

    const tBLE_BD_ADDR& legacy_address_with_type);

void ACL_ClearAddressResolution();

void ACL_ClearAcceptList();

void ACL_ClearFilterAcceptList();



}  // namespace shim

}  // namespace bluetooth

system/main/shim/btm_api.cc

+1 −1
Original line number Diff line number Diff line
@@ -1343,7 +1343,7 @@ tBTM_STATUS bluetooth::shim::BTM_ClearEventMask() { 
}



tBTM_STATUS bluetooth::shim::BTM_ClearFilterAcceptList() {

  Stack::GetInstance()->GetAcl()->ClearAcceptList();

  Stack::GetInstance()->GetAcl()->ClearFilterAcceptList();

  return BTM_SUCCESS;

}