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

Change GetAddress() to GetMacAddress() in BluetoothAdapter

Browse Source 
PiperOrigin-RevId: 834896610
This commit is contained in:
Crisrael Lucero
2025-11-20 13:49:49 -08:00
committed by Copybara-Service
parent 023db9bd33
commit dd943af8e9
20 changed files with 36 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/platform/implementation/g3/ble_test.cc
+1 -1
View File
@@ -48,7 +48,7 @@ class MockBluetoothAdapter : public BluetoothAdapter {
MOCK_METHOD(bool, SetName, (absl::string_view name, bool persist),
(override));
MOCK_METHOD(std::string, GetName, (), (const, override));
MOCK_METHOD(MacAddress, GetAddress, (), (const, override));
MOCK_METHOD(MacAddress, GetMacAddress, (), (const, override));
MOCK_METHOD(bool, SetScanMode, (api::BluetoothAdapter::ScanMode scan_mode),
(override));
MOCK_METHOD(api::BluetoothAdapter::ScanMode, GetScanMode, (),
internal/platform/implementation/g3/bluetooth_adapter.cc
+3 -1
View File
@@ -37,7 +37,9 @@ BluetoothDevice::BluetoothDevice(BluetoothAdapter* adapter)
std::string BluetoothDevice::GetName() const { return adapter_.GetName(); }
MacAddress BluetoothDevice::GetAddress() const { return adapter_.GetAddress(); }
MacAddress BluetoothDevice::GetMacAddress() const {
return adapter_.GetMacAddress();
}
BluetoothAdapter::BluetoothAdapter() {
std::uint64_t raw_mac_addr = Prng().NextInt64() & kMacAddressMask;
internal/platform/implementation/g3/bluetooth_adapter.h
+2 -2
View File
@@ -39,7 +39,7 @@ class BluetoothDevice : public api::BluetoothDevice {
// https://developer.android.com/reference/android/bluetooth/BluetoothDevice.html#getName()
std::string GetName() const override;
MacAddress GetAddress() const override;
MacAddress GetMacAddress() const override;
BluetoothAdapter& GetAdapter() { return adapter_; }
private:
@@ -87,7 +87,7 @@ class BluetoothAdapter : public api::BluetoothAdapter {
ABSL_LOCKS_EXCLUDED(mutex_);
// Returns BT MAC address assigned to this adapter.
MacAddress GetAddress() const override { return mac_address_; }
MacAddress GetMacAddress() const override { return mac_address_; }
BluetoothDevice& GetDevice() { return device_; }
internal/platform/implementation/g3/bluetooth_classic.cc
+1 -1
View File
@@ -180,7 +180,7 @@ std::unique_ptr<api::BluetoothSocket> BluetoothClassicMedium::ConnectToService(
// supported in tests.
api::BluetoothDevice* device =
MediumEnvironment::Instance().FindBluetoothDevice(
remote_device.GetAddress());
remote_device.GetMacAddress());
if (device == nullptr) {
LOG(ERROR) << "G3 ConnectToService [peer]: device=" << &remote_device
<< " not found";