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

upstream changes applied to linux impl

Browse Source
This commit is contained in:
kidfromjupiter
2026-02-04 22:04:03 +00:00
parent 5ec5b2b10f
commit 4d2f34ccfb
50 changed files with 505 additions and 10803 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/platform/implementation/linux/bluetooth_classic_device.cc
+8 -4
View File
@@ -63,11 +63,13 @@ std::string BluetoothDevice::GetName() const {
}
}
std::string BluetoothDevice::GetMacAddress() const {
MacAddress BluetoothDevice::GetMacAddress() const {
auto device = device_;
if (device == nullptr) {
absl::ReaderMutexLock l(&properties_mutex_);
return last_known_name_;
MacAddress addr;
MacAddress::FromString("00:00:00:00:00:00", addr);
return addr;
}
try {
@@ -76,10 +78,12 @@ std::string BluetoothDevice::GetMacAddress() const {
absl::MutexLock l(&properties_mutex_);
MacAddress::FromString(addr, last_known_address_);
}
return addr;
return last_known_address_;
} catch (const sdbus::Error &e) {
DBUS_LOG_PROPERTY_GET_ERROR(device, "Address", e);
return std::string();
MacAddress addr;
MacAddress::FromString("00:00:00:00:00:00", addr);
return addr;
}
}