ISecurityManagerListener: use AddressWithType
Bug: 142341141
Change-Id: Iff326f3204af6e2b6a4f8d7157ca863598e1367d
diff --git a/gd/security/internal/security_manager_impl.cc b/gd/security/internal/security_manager_impl.cc
index 26179b5..b245ff9 100644
--- a/gd/security/internal/security_manager_impl.cc
+++ b/gd/security/internal/security_manager_impl.cc
@@ -121,20 +121,20 @@
LOG_ALWAYS_FATAL("Listener has not been registered!");
}
-void SecurityManagerImpl::NotifyDeviceBonded(std::shared_ptr<Device> device) {
+void SecurityManagerImpl::NotifyDeviceBonded(hci::AddressWithType device) {
for (auto& iter : listeners_) {
iter.second->Post(common::Bind(&ISecurityManagerListener::OnDeviceBonded, common::Unretained(iter.first), device));
}
}
-void SecurityManagerImpl::NotifyDeviceBondFailed(std::shared_ptr<Device> device) {
+void SecurityManagerImpl::NotifyDeviceBondFailed(hci::AddressWithType device) {
for (auto& iter : listeners_) {
iter.second->Post(
common::Bind(&ISecurityManagerListener::OnDeviceBondFailed, common::Unretained(iter.first), device));
}
}
-void SecurityManagerImpl::NotifyDeviceUnbonded(std::shared_ptr<Device> device) {
+void SecurityManagerImpl::NotifyDeviceUnbonded(hci::AddressWithType device) {
for (auto& iter : listeners_) {
iter.second->Post(
common::Bind(&ISecurityManagerListener::OnDeviceUnbonded, common::Unretained(iter.first), device));
diff --git a/gd/security/internal/security_manager_impl.h b/gd/security/internal/security_manager_impl.h
index 23b39e1..d6768c9 100644
--- a/gd/security/internal/security_manager_impl.h
+++ b/gd/security/internal/security_manager_impl.h
@@ -93,9 +93,9 @@
protected:
std::vector<std::pair<ISecurityManagerListener*, os::Handler*>> listeners_;
- 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);
+ void NotifyDeviceBonded(hci::AddressWithType device);
+ void NotifyDeviceBondFailed(hci::AddressWithType device);
+ void NotifyDeviceUnbonded(hci::AddressWithType device);
// ISecurityManagerChannel
void OnChangeConnectionLinkKeyComplete(std::shared_ptr<hci::Device> device,
diff --git a/gd/security/security_manager.h b/gd/security/security_manager.h
index deb2788..d83c8d3 100644
--- a/gd/security/security_manager.h
+++ b/gd/security/security_manager.h
@@ -21,8 +21,8 @@
#include <memory>
#include <vector>
+#include "hci/address_with_type.h"
#include "hci/device.h"
-#include "hci/device_database.h"
#include "security/internal/security_manager_impl.h"
namespace bluetooth {
@@ -38,23 +38,23 @@
/**
* Called when a device is successfully bonded.
*
- * @param device pointer to the bonded device
+ * @param address of the newly bonded device
*/
- virtual void OnDeviceBonded(std::shared_ptr<bluetooth::hci::Device> device) = 0;
+ virtual void OnDeviceBonded(bluetooth::hci::AddressWithType device) = 0;
/**
* Called when a device is successfully un-bonded.
*
- * @param device pointer to the device that is no longer bonded
+ * @param address of device that is no longer bonded
*/
- virtual void OnDeviceUnbonded(std::shared_ptr<bluetooth::hci::Device> device) = 0;
+ virtual void OnDeviceUnbonded(bluetooth::hci::AddressWithType device) = 0;
/**
* Called as a result of a failure during the bonding process.
*
- * @param device pointer to the device that is no longer bonded
+ * @param address of the device that failed to bond
*/
- virtual void OnDeviceBondFailed(std::shared_ptr<bluetooth::hci::Device> device) = 0;
+ virtual void OnDeviceBondFailed(bluetooth::hci::AddressWithType device) = 0;
};
/**