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

Commit 3da475a4 authored Apr 13, 2022 by Chris Manton Committed by Automerger Merge Worker Apr 13, 2022

Merge "Add le_address_manager::UnregisterSync" am: 77c7617e am: 82194fa4 am: b963305f

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

Change-Id: I9a1003b4a04ff0d1fc3586e92e115bbf3bc24788
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents b6cd7220 b963305f

system/gd/hci/acl_manager/le_impl.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -119,7 +119,7 @@ struct le_impl : public bluetooth::hci::LeAddressManagerCallback {

	~le_impl() {		~le_impl() {
	if (address_manager_registered) {		if (address_manager_registered) {
	le_address_manager_->Unregister(this);		le_address_manager_->UnregisterSync(this);
	}		}
	delete le_address_manager_;		delete le_address_manager_;
	hci_layer_->PutLeAclConnectionInterface();		hci_layer_->PutLeAclConnectionInterface();

system/gd/hci/le_address_manager.cc

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -177,6 +177,14 @@ void LeAddressManager::unregister_client(LeAddressManagerCallback* callback) {
	}		}
	}		}

			bool LeAddressManager::UnregisterSync(LeAddressManagerCallback* callback, std::chrono::milliseconds timeout) {
			handler_->BindOnceOn(this, &LeAddressManager::unregister_client, callback).Invoke();
			std::promise<void> promise;
			auto future = promise.get_future();
			handler_->Post(common::BindOnce(&std::promise<void>::set_value, common::Unretained(&promise)));
			return future.wait_for(timeout) == std::future_status::ready;
			}

	void LeAddressManager::AckPause(LeAddressManagerCallback* callback) {		void LeAddressManager::AckPause(LeAddressManagerCallback* callback) {
	handler_->BindOnceOn(this, &LeAddressManager::ack_pause, callback).Invoke();		handler_->BindOnceOn(this, &LeAddressManager::ack_pause, callback).Invoke();
	}		}

system/gd/hci/le_address_manager.h

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -27,6 +27,8 @@
	namespace bluetooth {		namespace bluetooth {
	namespace hci {		namespace hci {

			constexpr std::chrono::milliseconds kUnregisterSyncTimeoutInMs = std::chrono::milliseconds(10);

	class LeAddressManagerCallback {		class LeAddressManagerCallback {
	public:		public:
	virtual ~LeAddressManagerCallback() = default;		virtual ~LeAddressManagerCallback() = default;
	@@ -72,6 +74,8 @@ class LeAddressManager {
	void AckResume(LeAddressManagerCallback* callback);		void AckResume(LeAddressManagerCallback* callback);
	virtual AddressPolicy Register(LeAddressManagerCallback* callback);		virtual AddressPolicy Register(LeAddressManagerCallback* callback);
	virtual void Unregister(LeAddressManagerCallback* callback);		virtual void Unregister(LeAddressManagerCallback* callback);
			virtual bool UnregisterSync(
			LeAddressManagerCallback* callback, std::chrono::milliseconds timeout = kUnregisterSyncTimeoutInMs);
	virtual AddressWithType GetCurrentAddress(); // What was set in SetRandomAddress()		virtual AddressWithType GetCurrentAddress(); // What was set in SetRandomAddress()
	virtual AddressWithType GetAnotherAddress(); // A new random address without rotating.		virtual AddressWithType GetAnotherAddress(); // A new random address without rotating.