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

Commit d4d18fa0 authored by Jakub Pawlowski's avatar Jakub Pawlowski Committed by android-build-merger
Browse files

SecurityManagerImpl: cleanup callback helper functions naming am: 14b978e0 am: bcdbc3d9 

am: a884d3fd

Change-Id: I774491ea0b711fef5ea3d4b7432207f9588a2758
parents c80ad6f1 a884d3fd

system/gd/security/internal/security_manager_impl.cc

+3 −3
Original line number Diff line number Diff line
@@ -121,20 +121,20 @@ void SecurityManagerImpl::UnregisterCallbackListener(ISecurityManagerListener* l 
  LOG_ALWAYS_FATAL("Listener has not been registered!");

}



void SecurityManagerImpl::FireDeviceBondedCallbacks(std::shared_ptr<Device> device) {

void SecurityManagerImpl::NotifyDeviceBonded(std::shared_ptr<Device> device) {

  for (auto& iter : listeners_) {

    iter.second->Post(common::Bind(&ISecurityManagerListener::OnDeviceBonded, common::Unretained(iter.first), device));

  }

}



void SecurityManagerImpl::FireBondFailedCallbacks(std::shared_ptr<Device> device) {

void SecurityManagerImpl::NotifyDeviceBondFailed(std::shared_ptr<Device> device) {

  for (auto& iter : listeners_) {

    iter.second->Post(

        common::Bind(&ISecurityManagerListener::OnDeviceBondFailed, common::Unretained(iter.first), device));

  }

}



void SecurityManagerImpl::FireUnbondCallbacks(std::shared_ptr<Device> device) {

void SecurityManagerImpl::NotifyDeviceUnbonded(std::shared_ptr<Device> device) {

  for (auto& iter : listeners_) {

    iter.second->Post(

        common::Bind(&ISecurityManagerListener::OnDeviceUnbonded, common::Unretained(iter.first), device));

system/gd/security/internal/security_manager_impl.h

+3 −3
Original line number Diff line number Diff line
@@ -93,9 +93,9 @@ class SecurityManagerImpl /*: public channel::ISecurityManagerChannelListener*/ 


 protected:

  std::vector<std::pair<ISecurityManagerListener*, os::Handler*>> listeners_;

  void FireDeviceBondedCallbacks(std::shared_ptr<bluetooth::hci::Device> device);

  void FireBondFailedCallbacks(std::shared_ptr<bluetooth::hci::Device> device);

  void FireUnbondCallbacks(std::shared_ptr<bluetooth::hci::Device> device);

  void NotifyDeviceBonded(std::shared_ptr<bluetooth::hci::Device> device);

  void NotifyDeviceBondFailed(std::shared_ptr<bluetooth::hci::Device> device);

  void NotifyDeviceUnbonded(std::shared_ptr<bluetooth::hci::Device> device);



  // ISecurityManagerChannel

  void OnChangeConnectionLinkKeyComplete(std::shared_ptr<hci::Device> device,