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

Fixed the crash bug b/369666780

Browse Source 
PiperOrigin-RevId: 696151353
This commit is contained in:
Guogang Li
2024-11-13 08:49:00 -08:00
committed by Copybara-Service
parent 0163118e85
commit bdb220fcfd
1 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
connections/implementation/p2p_cluster_pcp_handler.cc
+18
View File
@@ -343,6 +343,12 @@ void P2pClusterPcpHandler::BluetoothDeviceDiscoveredHandler(
"p2p-bt-device-discovered",
[this, client, service_id, device]()
RUN_ON_PCP_HANDLER_THREAD() {
if (!device.IsValid()) {
NEARBY_LOGS(WARNING) << "BluetoothDeviceDiscoveredHandler: "
"Skipping the invalid Bluetooth device";
return;
}
// Make sure we are still discovering before proceeding.
if (!client->IsDiscovering()) {
NEARBY_LOGS(WARNING) << "Skipping discovery of BluetoothDevice "
@@ -388,6 +394,12 @@ void P2pClusterPcpHandler::BluetoothNameChangedHandler(
"p2p-bt-name-changed",
[this, client, service_id, device]() RUN_ON_PCP_HANDLER_THREAD() {
// Make sure we are still discovering before proceeding.
if (!device.IsValid()) {
NEARBY_LOGS(WARNING) << "BluetoothNameChangedHandler: Skipping the "
"invalid Bluetooth device";
return;
}
if (!client->IsDiscovering()) {
NEARBY_LOGS(WARNING)
<< "Ignoring lost BluetoothDevice " << device.GetName()
@@ -462,6 +474,12 @@ void P2pClusterPcpHandler::BluetoothNameChangedHandler(
void P2pClusterPcpHandler::BluetoothDeviceLostHandler(
ClientProxy* client, const std::string& service_id,
BluetoothDevice& device) {
if (!device.IsValid()) {
NEARBY_LOGS(WARNING)
<< "BluetoothDeviceLostHandler:Skipping the invalid Bluetooth device";
return;
}
const std::string& device_name_string = device.GetName();
RunOnPcpHandlerThread(
"p2p-bt-device-lost", [this, client, service_id,