Merge "le_impl: Simplify add/remove connect and resolution addresses" (97063b96) · Commits · e / os / android_packages_modules_Bluetooth

system/gd/hci/acl_manager/le_impl.h

+12 −70

Original line number	Diff line number	Diff line
		@@ -377,22 +377,9 @@ struct le_impl : public bluetooth::hci::LeAddressManagerCallback {
		}

		void add_device_to_connect_list(AddressWithType address_with_type) {
		AddressType address_type = address_with_type.GetAddressType();
		if (!address_manager_registered) {
		le_address_manager_->Register(this);
		address_manager_registered = true;
		}
		pause_connection = true;
		switch (address_type) {
		case AddressType::PUBLIC_DEVICE_ADDRESS:
		case AddressType::PUBLIC_IDENTITY_ADDRESS: {
		le_address_manager_->AddDeviceToConnectList(ConnectListAddressType::PUBLIC, address_with_type.GetAddress());
		} break;
		case AddressType::RANDOM_DEVICE_ADDRESS:
		case AddressType::RANDOM_IDENTITY_ADDRESS: {
		le_address_manager_->AddDeviceToConnectList(ConnectListAddressType::RANDOM, address_with_type.GetAddress());
		}
		}
		register_with_address_manager();
		le_address_manager_->AddDeviceToConnectList(
		address_with_type.ToConnectListAddressType(), address_with_type.GetAddress());
		}

		void clear_connect_list() {
		@@ -405,70 +392,25 @@ struct le_impl : public bluetooth::hci::LeAddressManagerCallback {
		}

		void remove_device_from_connect_list(AddressWithType address_with_type) {
		AddressType address_type = address_with_type.GetAddressType();
		direct_connections_.erase(address_with_type);
		if (!address_manager_registered) {
		le_address_manager_->Register(this);
		address_manager_registered = true;
		}
		pause_connection = true;
		switch (address_type) {
		case AddressType::PUBLIC_DEVICE_ADDRESS:
		case AddressType::PUBLIC_IDENTITY_ADDRESS: {
		register_with_address_manager();
		le_address_manager_->RemoveDeviceFromConnectList(
		ConnectListAddressType::PUBLIC, address_with_type.GetAddress());
		} break;
		case AddressType::RANDOM_DEVICE_ADDRESS:
		case AddressType::RANDOM_IDENTITY_ADDRESS: {
		le_address_manager_->RemoveDeviceFromConnectList(
		ConnectListAddressType::RANDOM, address_with_type.GetAddress());
		}
		}
		address_with_type.ToConnectListAddressType(), address_with_type.GetAddress());
		}

		void add_device_to_resolving_list(
		AddressWithType address_with_type,
		const std::array<uint8_t, 16>& peer_irk,
		const std::array<uint8_t, 16>& local_irk) {
		AddressType address_type = address_with_type.GetAddressType();
		if (!address_manager_registered) {
		le_address_manager_->Register(this);
		address_manager_registered = true;
		}
		pause_connection = true;
		switch (address_type) {
		case AddressType::PUBLIC_DEVICE_ADDRESS:
		case AddressType::PUBLIC_IDENTITY_ADDRESS: {
		register_with_address_manager();
		le_address_manager_->AddDeviceToResolvingList(
		PeerAddressType::PUBLIC_DEVICE_OR_IDENTITY_ADDRESS, address_with_type.GetAddress(), peer_irk, local_irk);
		} break;
		case AddressType::RANDOM_DEVICE_ADDRESS:
		case AddressType::RANDOM_IDENTITY_ADDRESS: {
		le_address_manager_->AddDeviceToResolvingList(
		PeerAddressType::RANDOM_DEVICE_OR_IDENTITY_ADDRESS, address_with_type.GetAddress(), peer_irk, local_irk);
		}
		}
		address_with_type.ToPeerAddressType(), address_with_type.GetAddress(), peer_irk, local_irk);
		}

		void remove_device_from_resolving_list(AddressWithType address_with_type) {
		AddressType address_type = address_with_type.GetAddressType();
		if (!address_manager_registered) {
		le_address_manager_->Register(this);
		address_manager_registered = true;
		}
		pause_connection = true;
		switch (address_type) {
		case AddressType::PUBLIC_DEVICE_ADDRESS:
		case AddressType::PUBLIC_IDENTITY_ADDRESS: {
		register_with_address_manager();
		le_address_manager_->RemoveDeviceFromResolvingList(
		PeerAddressType::PUBLIC_DEVICE_OR_IDENTITY_ADDRESS, address_with_type.GetAddress());
		} break;
		case AddressType::RANDOM_DEVICE_ADDRESS:
		case AddressType::RANDOM_IDENTITY_ADDRESS: {
		le_address_manager_->RemoveDeviceFromResolvingList(
		PeerAddressType::RANDOM_DEVICE_OR_IDENTITY_ADDRESS, address_with_type.GetAddress());
		}
		}
		address_with_type.ToPeerAddressType(), address_with_type.GetAddress());
		}

		void create_le_connection(AddressWithType address_with_type, bool add_to_connect_list, bool is_direct) {