TySS-Dev/nearby
1
0
Fork 0
mirror of https://github.com/kidfromjupiter/nearby.git synced 2026-09-16 15:36:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'google3' to roll forward up to cl/351408510.

Browse Source
This commit is contained in:
hai007
2021-01-12 11:20:06 -08:00
parent 085907fea9 0be1cd03ce
commit b588cb34b4
11 changed files with 171 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cpp/core/internal/mediums/bluetooth_classic.cc
+12
View File
@@ -346,6 +346,18 @@ bool BluetoothClassic::StopAcceptingConnections(
BluetoothSocket BluetoothClassic::Connect(BluetoothDevice& bluetooth_device,
const std::string& service_name) {
for (int attempts_count = 0; attempts_count < kConnectAttemptsLimit;
attempts_count++) {
auto wrapper_result = AttemptToConnect(bluetooth_device, service_name);
if (wrapper_result.IsValid()) {
return wrapper_result;
}
}
return BluetoothSocket();
}
BluetoothSocket BluetoothClassic::AttemptToConnect(
BluetoothDevice& bluetooth_device, const std::string& service_name) {
MutexLock lock(&mutex_);
NEARBY_LOG(INFO, "BluetoothClassic::Connect: device=%p", &bluetooth_device);
// Socket to return. To allow for NRVO to work, it has to be a single object.