Index: device/bluetooth/bluetooth_device_chromeos.cc |
diff --git a/device/bluetooth/bluetooth_device_chromeos.cc b/device/bluetooth/bluetooth_device_chromeos.cc |
index 05359279bcd46aa6a3c71a3ed6bf0e50340abd76..1d5fb53a8cc85cac349536491415d5d608bd3b73 100644 |
--- a/device/bluetooth/bluetooth_device_chromeos.cc |
+++ b/device/bluetooth/bluetooth_device_chromeos.cc |
@@ -223,18 +223,32 @@ uint16 BluetoothDeviceChromeOS::GetDeviceID() const { |
} |
int BluetoothDeviceChromeOS::GetRSSI() const { |
- NOTIMPLEMENTED(); |
- return kUnknownPower; |
+ BluetoothDeviceClient::Properties* properties = |
+ DBusThreadManager::Get()->GetBluetoothDeviceClient()->GetProperties( |
+ object_path_); |
+ DCHECK(properties); |
+ |
+ return IsConnected() ? properties->connection_rssi.value() : kUnknownPower; |
keybuk
2014/05/09 18:27:06
Shouldn't this be "is a connection monitor running
Tim Song
2014/05/09 19:01:35
Done. I added a boolean member variable tracking i
|
} |
int BluetoothDeviceChromeOS::GetCurrentHostTransmitPower() const { |
- NOTIMPLEMENTED(); |
- return kUnknownPower; |
+ BluetoothDeviceClient::Properties* properties = |
+ DBusThreadManager::Get()->GetBluetoothDeviceClient()->GetProperties( |
+ object_path_); |
+ DCHECK(properties); |
+ |
+ return IsConnected() ? properties->connection_tx_power.value() |
+ : kUnknownPower; |
} |
int BluetoothDeviceChromeOS::GetMaximumHostTransmitPower() const { |
- NOTIMPLEMENTED(); |
- return kUnknownPower; |
+ BluetoothDeviceClient::Properties* properties = |
+ DBusThreadManager::Get()->GetBluetoothDeviceClient()->GetProperties( |
+ object_path_); |
+ DCHECK(properties); |
+ |
+ return IsConnected() ? properties->connection_tx_power_max.value() |
+ : kUnknownPower; |
} |
bool BluetoothDeviceChromeOS::IsPaired() const { |
@@ -655,6 +669,22 @@ void BluetoothDeviceChromeOS::OnSetTrusted(bool success) { |
<< ": Failed to set device as trusted"; |
} |
+void BluetoothDeviceChromeOS::StartConnectionMonitor() { |
+ DBusThreadManager::Get()->GetBluetoothDeviceClient()->StartConnectionMonitor( |
+ object_path_, |
+ base::Bind(&base::DoNothing), |
+ base::Bind(&BluetoothDeviceChromeOS::OnStartConnectionMonitorError, |
+ weak_ptr_factory_.GetWeakPtr())); |
+} |
+ |
+void BluetoothDeviceChromeOS::OnStartConnectionMonitorError( |
+ const std::string& error_name, |
+ const std::string& error_message) { |
+ LOG(WARNING) << object_path_.value() |
+ << ": Failed to start connection monitor: " << error_name << ": " |
+ << error_message; |
+} |
+ |
void BluetoothDeviceChromeOS::OnDisconnect(const base::Closure& callback) { |
VLOG(1) << object_path_.value() << ": Disconnected"; |
callback.Run(); |