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

Assign empty string to bluetooth_mac_address instead of invalid argument

Browse Source 
PiperOrigin-RevId: 763894090
This commit is contained in:
Crisrael Lucero
2025-05-27 12:09:13 -07:00
committed by Copybara-Service
parent a11e05c59c
commit 7940128bf9
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
connections/implementation/ble_advertisement.cc
+11 -11
View File
@@ -206,19 +206,19 @@ absl::StatusOr<BleAdvertisement> BleAdvertisement::CreateBleAdvertisement(
absl::StatusOr<uint64_t> bluetooth_mac_address_bytes_uint64 =
bluetooth_mac_address_bytes->Read6BytesAsUint64();
if (!bluetooth_mac_address_bytes_uint64.ok()) {
return absl::InvalidArgumentError(
"Cannot deserialize BleAdvertisement: bluetooth_mac_address.");
}
MacAddress mac_address;
if (!MacAddress::FromUint64(bluetooth_mac_address_bytes_uint64.value(),
mac_address) ||
!mac_address.IsSet()) {
return absl::InvalidArgumentError(
"Cannot convert BleAdvertisement: bluetooth_mac_address.");
// TODO(b/420331699): Returning an empty string for the MAC address when
// there's an invalid ByteArray is problematic, determine where an invalid
// ByteArray is being passed in upstream so we can modify this to not use
// an empty string.
if (bluetooth_mac_address_bytes_uint64.ok() &&
MacAddress::FromUint64(bluetooth_mac_address_bytes_uint64.value(),
mac_address) &&
mac_address.IsSet()) {
bluetooth_mac_address = mac_address.ToString();
} else {
bluetooth_mac_address = "";
}
bluetooth_mac_address = mac_address.ToString();
}
// The next 1 byte is supposed to be the length of the uwb_address. If the