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

Use medium to check whether discovery is active

Browse Source 
PiperOrigin-RevId: 786818627
This commit is contained in:
Guogang Li
2025-07-24 13:35:00 -07:00
committed by Copybara-Service
parent 71cdf84236
commit 1ba0f831b5
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
connections/implementation/p2p_cluster_pcp_handler.cc
+8 -10
View File
@@ -435,10 +435,9 @@ void P2pClusterPcpHandler::BluetoothDeviceDiscoveredHandler(
}
// Make sure we are still discovering before proceeding.
if (!client->IsDiscovering()) {
LOG(WARNING) << "Skipping discovery of BluetoothDevice "
<< device.GetName()
<< " because we are no longer discovering.";
if (!bluetooth_medium_.IsDiscovering(service_id)) {
LOG(WARNING) << "Skipping discovered Bluetooth device due to "
"no longer discovering.";
return;
}
@@ -485,9 +484,9 @@ void P2pClusterPcpHandler::BluetoothNameChangedHandler(
return;
}
if (!client->IsDiscovering()) {
LOG(WARNING) << "Ignoring lost BluetoothDevice " << device.GetName()
<< " because Connections is no longer discovering.";
if (!bluetooth_medium_.IsDiscovering(service_id)) {
LOG(WARNING) << "Ignoring name changed Bluetooth device due to no "
"longer discovering.";
return;
}
@@ -566,9 +565,8 @@ void P2pClusterPcpHandler::BluetoothDeviceLostHandler(
"p2p-bt-device-lost", [this, client, service_id,
device_name_string]() RUN_ON_PCP_HANDLER_THREAD() {
// Make sure we are still discovering before proceeding.
if (!client->IsDiscovering()) {
LOG(WARNING) << "Ignoring lost BluetoothDevice " << device_name_string
<< " because Connections is no "
if (!bluetooth_medium_.IsDiscovering(service_id)) {
LOG(WARNING) << "Ignoring lost Bluetooth device due to no "
"longer discovering.";
return;
}