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

internal fix

Browse Source 
PiperOrigin-RevId: 622893779
This commit is contained in:
Hai Shang
2024-04-08 10:49:27 -07:00
committed by Copybara-Service
parent d2c8fc3cd5
commit 8f51d92f22
2 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
connections/implementation/mediums/ble_v2/discovered_peripheral_tracker.cc
+3
View File
@@ -819,6 +819,9 @@ bool DiscoveredPeripheralTracker::IsLegacyDeviceAdvertisementData(
const BleAdvertisementData& advertisement_data) {
return !advertisement_data.is_extended_advertisement &&
advertisement_data.service_data.size() == 1 &&
advertisement_data.service_data.find(
bleutils::kCopresenceServiceUuid) !=
advertisement_data.service_data.end() &&
advertisement_data.service_data.at(bleutils::kCopresenceServiceUuid) ==
ByteArray(DiscoveredPeripheralTracker::kDummyAdvertisementValue);
}
connections/implementation/mediums/ble_v2/discovered_peripheral_tracker_test.cc
+19 -19
View File
@@ -204,7 +204,7 @@ TEST_F(DiscoveredPeripheralTrackerTest,
},
Uuid(kFastAdvertisementServiceUuid));
api::ble_v2::BleAdvertisementData advertisement_data;
api::ble_v2::BleAdvertisementData advertisement_data{};
if (!fast_advertisement_bytes.Empty()) {
advertisement_data.service_data.insert(
{Uuid(kFastAdvertisementServiceUuid), fast_advertisement_bytes});
@@ -244,7 +244,7 @@ TEST_F(DiscoveredPeripheralTrackerTest,
},
Uuid(kFastAdvertisementServiceUuid));
api::ble_v2::BleAdvertisementData advertisement_data;
api::ble_v2::BleAdvertisementData advertisement_data{};
if (!fast_advertisement_bytes.Empty()) {
advertisement_data.service_data.insert(
{Uuid(kFastAdvertisementServiceUuid), fast_advertisement_bytes});
@@ -315,7 +315,7 @@ TEST_F(DiscoveredPeripheralTrackerTest,
},
Uuid(kFastAdvertisementServiceUuid));
api::ble_v2::BleAdvertisementData advertisement_data;
api::ble_v2::BleAdvertisementData advertisement_data{};
if (!fast_advertisement_bytes.Empty()) {
advertisement_data.service_data.insert(
{Uuid(kFastAdvertisementServiceUuid), fast_advertisement_bytes});
@@ -359,7 +359,7 @@ TEST_F(DiscoveredPeripheralTrackerTest,
},
Uuid("FE3C"));
api::ble_v2::BleAdvertisementData advertisement_data;
api::ble_v2::BleAdvertisementData advertisement_data{};
if (!fast_advertisement_bytes.Empty()) {
advertisement_data.service_data.insert(
{Uuid(kFastAdvertisementServiceUuid), fast_advertisement_bytes});
@@ -416,7 +416,7 @@ TEST_F(DiscoveredPeripheralTrackerTest,
},
{});
api::ble_v2::BleAdvertisementData advertisement_data;
api::ble_v2::BleAdvertisementData advertisement_data{};
if (!advertisement_header_bytes.Empty()) {
advertisement_data.service_data.insert(
{bleutils::kCopresenceServiceUuid, advertisement_header_bytes});
@@ -461,7 +461,7 @@ TEST_F(DiscoveredPeripheralTrackerTest,
},
{});
api::ble_v2::BleAdvertisementData advertisement_data;
api::ble_v2::BleAdvertisementData advertisement_data{};
if (!advertisement_header_bytes.Empty()) {
advertisement_data.service_data.insert(
{bleutils::kCopresenceServiceUuid, advertisement_header_bytes});
@@ -497,7 +497,7 @@ TEST_F(DiscoveredPeripheralTrackerTest,
},
{});
api::ble_v2::BleAdvertisementData advertisement_data;
api::ble_v2::BleAdvertisementData advertisement_data{};
if (!advertisement_header_bytes.Empty()) {
advertisement_data.service_data.insert(
{bleutils::kCopresenceServiceUuid, advertisement_header_bytes});
@@ -543,7 +543,7 @@ TEST_F(DiscoveredPeripheralTrackerTest,
},
{});
api::ble_v2::BleAdvertisementData advertisement_data;
api::ble_v2::BleAdvertisementData advertisement_data{};
if (!advertisement_header_bytes.Empty()) {
advertisement_data.service_data.insert(
{bleutils::kCopresenceServiceUuid, advertisement_header_bytes});
@@ -589,7 +589,7 @@ TEST_F(DiscoveredPeripheralTrackerTest,
},
{});
api::ble_v2::BleAdvertisementData advertisement_data;
api::ble_v2::BleAdvertisementData advertisement_data{};
if (!advertisement_header_bytes.Empty()) {
advertisement_data.service_data.insert(
{bleutils::kCopresenceServiceUuid, advertisement_header_bytes});
@@ -632,7 +632,7 @@ TEST_F(DiscoveredPeripheralTrackerTest,
},
{});
api::ble_v2::BleAdvertisementData advertisement_data;
api::ble_v2::BleAdvertisementData advertisement_data{};
if (!advertisement_header_bytes.Empty()) {
advertisement_data.service_data.insert(
{bleutils::kCopresenceServiceUuid, advertisement_header_bytes});
@@ -681,7 +681,7 @@ TEST_F(DiscoveredPeripheralTrackerTest,
},
Uuid(kFastAdvertisementServiceUuid));
api::ble_v2::BleAdvertisementData advertisement_data;
api::ble_v2::BleAdvertisementData advertisement_data{};
if (!advertisement_header_bytes.Empty()) {
advertisement_data.service_data.insert(
{bleutils::kCopresenceServiceUuid, advertisement_header_bytes});
@@ -741,7 +741,7 @@ TEST_F(DiscoveredPeripheralTrackerTest,
},
Uuid(kFastAdvertisementServiceUuid));
api::ble_v2::BleAdvertisementData advertisement_data;
api::ble_v2::BleAdvertisementData advertisement_data{};
if (!advertisement_header_bytes.Empty()) {
advertisement_data.service_data.insert(
{bleutils::kCopresenceServiceUuid, advertisement_header_bytes});
@@ -798,7 +798,7 @@ TEST_F(DiscoveredPeripheralTrackerTest, LostPeripheralForAdvertisementLost) {
},
{});
api::ble_v2::BleAdvertisementData advertisement_data;
api::ble_v2::BleAdvertisementData advertisement_data{};
if (!advertisement_header_bytes.Empty()) {
advertisement_data.service_data.insert(
{bleutils::kCopresenceServiceUuid, advertisement_header_bytes});
@@ -876,7 +876,7 @@ TEST_F(DiscoveredPeripheralTrackerTest,
},
{});
api::ble_v2::BleAdvertisementData advertisement_data;
api::ble_v2::BleAdvertisementData advertisement_data{};
if (!advertisement_header_bytes.Empty()) {
advertisement_data.service_data.insert(
{bleutils::kCopresenceServiceUuid, advertisement_header_bytes});
@@ -938,7 +938,7 @@ TEST_F(DiscoveredPeripheralTrackerTest,
},
{});
api::ble_v2::BleAdvertisementData advertisement_data;
api::ble_v2::BleAdvertisementData advertisement_data{};
if (!advertisement_header_bytes.Empty()) {
advertisement_data.service_data.insert(
{bleutils::kCopresenceServiceUuid, advertisement_header_bytes});
@@ -992,7 +992,7 @@ TEST_F(DiscoveredPeripheralTrackerTest, LostPeripheralForInstantOnLost) {
},
{});
api::ble_v2::BleAdvertisementData advertisement_data;
api::ble_v2::BleAdvertisementData advertisement_data{};
if (!advertisement_header_bytes.Empty()) {
advertisement_data.service_data.insert(
{bleutils::kCopresenceServiceUuid, advertisement_header_bytes});
@@ -1008,7 +1008,7 @@ TEST_F(DiscoveredPeripheralTrackerTest, LostPeripheralForInstantOnLost) {
auto advertisement = InstantOnLostAdvertisement::CreateFromHash(
advertisement_hash.AsStringView());
ASSERT_OK(advertisement);
api::ble_v2::BleAdvertisementData loss_advertisement_data;
api::ble_v2::BleAdvertisementData loss_advertisement_data{};
loss_advertisement_data.service_data.insert(
{bleutils::kCopresenceServiceUuid, ByteArray(advertisement->ToBytes())});
@@ -1029,7 +1029,7 @@ TEST_F(DiscoveredPeripheralTrackerTest, HandleDummyAdvertisement) {
.enable_invoking_legacy_device_discovered_cb = true,
};
MediumEnvironment::Instance().SetFeatureFlags(flag);
api::ble_v2::BleAdvertisementData advertising_data;
api::ble_v2::BleAdvertisementData advertising_data{};
advertising_data.is_extended_advertisement = false;
ByteArray encoded_bytes{
DiscoveredPeripheralTracker::kDummyAdvertisementValue};
@@ -1066,7 +1066,7 @@ TEST_F(DiscoveredPeripheralTrackerTest, SkipDummyAdvertisement) {
.enable_invoking_legacy_device_discovered_cb = false,
};
MediumEnvironment::Instance().SetFeatureFlags(flag);
api::ble_v2::BleAdvertisementData advertising_data;
api::ble_v2::BleAdvertisementData advertising_data{};
advertising_data.is_extended_advertisement = false;
ByteArray encoded_bytes{
DiscoveredPeripheralTracker::kDummyAdvertisementValue};