Merge "gd: Prevent erroneous fail connection on acceptlist change" (56703993) · Commits · e / os / android_packages_modules_Bluetooth

system/gd/hci/acl_manager/le_impl.h

+2 −4

Original line number	Original line	Diff line number	Diff line
	@@ -151,8 +151,7 @@ struct le_impl : public bluetooth::hci::LeAddressManagerCallback {
	AddressWithType remote_address(address, peer_address_type);		AddressWithType remote_address(address, peer_address_type);
	AddressWithType local_address = le_address_manager_->GetCurrentAddress();		AddressWithType local_address = le_address_manager_->GetCurrentAddress();
	on_common_le_connection_complete(remote_address);		on_common_le_connection_complete(remote_address);
	if (status == ErrorCode::UNKNOWN_CONNECTION &&		if (status == ErrorCode::UNKNOWN_CONNECTION && pause_connection) {
	canceled_connections_.find(remote_address) != canceled_connections_.end()) {
	// connection canceled by LeAddressManager.OnPause(), will auto reconnect by LeAddressManager.OnResume()		// connection canceled by LeAddressManager.OnPause(), will auto reconnect by LeAddressManager.OnResume()
	return;		return;
	} else {		} else {
	@@ -210,8 +209,7 @@ struct le_impl : public bluetooth::hci::LeAddressManagerCallback {
	remote_address = AddressWithType(peer_resolvable_address, AddressType::RANDOM_DEVICE_ADDRESS);		remote_address = AddressWithType(peer_resolvable_address, AddressType::RANDOM_DEVICE_ADDRESS);
	}		}
	on_common_le_connection_complete(remote_address);		on_common_le_connection_complete(remote_address);
	if (status == ErrorCode::UNKNOWN_CONNECTION &&		if (status == ErrorCode::UNKNOWN_CONNECTION && pause_connection) {
	canceled_connections_.find(remote_address) != canceled_connections_.end()) {
	// connection canceled by LeAddressManager.OnPause(), will auto reconnect by LeAddressManager.OnResume()		// connection canceled by LeAddressManager.OnPause(), will auto reconnect by LeAddressManager.OnResume()
	return;		return;
	} else {		} else {