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

Merge branch 'google3' up to cl/357028940.

Browse Source
This commit is contained in:
hai007
2021-02-12 12:27:58 -08:00
parent e8f26a84fb 468be3186c
commit 67b5896a56
3 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cpp/core/internal/base_pcp_handler.cc
+1 -1
View File
@@ -104,7 +104,7 @@ Status BasePcpHandler::StartAdvertising(ClientProxy* client,
response.Set({Status::kSuccess});
});
return WaitForResult(
absl::StrCat("StartAdvertising(", std::string(info.endpoint_info), ")"),
absl::StrCat("StartAdvertising(", service_id, ")"),
client->GetClientId(), &response);
}
cpp/core/internal/mediums/ble.cc
+1 -2
View File
@@ -83,8 +83,7 @@ bool Ble::StartAdvertising(const std::string& service_id,
return false;
}
NEARBY_LOGS(INFO) << "Turning on BLE advertising with advertisement bytes="
<< advertisement_bytes.data() << "("
NEARBY_LOGS(INFO) << "Turning on BLE advertising (advertisement size="
<< advertisement_bytes.size() << ")"
<< ", service id=" << service_id
<< ", fast advertisement service uuid="
cpp/core/internal/p2p_cluster_pcp_handler.cc
+2 -8
View File
@@ -1014,10 +1014,8 @@ proto::connections::Medium P2pClusterPcpHandler::StartBleAdvertising(
}
NEARBY_LOG(INFO,
"P2pClusterPcpHandler::StartBleAdvertising: service=%s: "
"make advertisement; id=%s, name=%s",
service_id.c_str(), local_endpoint_id.c_str(),
std::string(local_endpoint_info).c_str());
"P2pClusterPcpHandler::StartBleAdvertising: service=%s, id=%s",
service_id.c_str(), local_endpoint_id.c_str());
// Generate a BleAdvertisement. If a fast advertisement service UUID was
// provided, create a fast BleAdvertisement.
ByteArray advertisement_bytes;
@@ -1045,10 +1043,6 @@ proto::connections::Medium P2pClusterPcpHandler::StartBleAdvertising(
"BleAdvertisement failed");
ble_medium_.StopAcceptingConnections(service_id);
return proto::connections::UNKNOWN_MEDIUM;
} else {
NEARBY_LOGS(INFO) << "P2pClusterPcpHandler::StartBleAdvertising: generate "
"BleAdvertisement succeeded; advertisement_bytes="
<< advertisement_bytes.data();
}
NEARBY_LOG(