Hook up RSSI and host transmit power Bluetooth device properties for ChromeOS.

device/bluetooth/bluetooth_device_chromeos.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "device/bluetooth/bluetooth_device_chromeos.h"
 
 #include <stdio.h>
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 205 matching lines @@
   return product_id;
 }
 
 uint16 BluetoothDeviceChromeOS::GetDeviceID() const {
   uint16 device_id  = 0;
   ParseModalias(object_path_, NULL, NULL, NULL, &device_id);
   return device_id;
 }
 
 int BluetoothDeviceChromeOS::GetRSSI() const {
-  NOTIMPLEMENTED();
-  return kUnknownPower;
+  BluetoothDeviceClient::Properties* properties =
+      DBusThreadManager::Get()->GetBluetoothDeviceClient()->GetProperties(
+          object_path_);
+  DCHECK(properties);
+
+  return IsConnected() ? properties->connection_rssi.value()
+                       : properties->inquiry_rssi.value();

[keybuk, 2014/05/09 00:35:25]

Do we really want to conflate these properties into one?

Good arguments were given upstream for not doing that ... shouldn't we follow
suit?

If not, the Inquiry RSSI is likely to be better for BR/EDR devices (the
connection one is relative to golden range) - while the Connection RSSI is
better for LE devices

[Tim Song, 2014/05/09 02:55:29]

It does make sense to have a connection RSSI and an inquiry RSSI as separate
values.

The GetRSSI() function in the BluetoothDevice interface says that it should
return the inquiry RSSI if not connected and connection RSSI if connected. I
think we should split this in a separate CL as it touches the extension API.

[keybuk, 2014/05/09 18:22:07]

That separate CL will be much easier if you only store connection RSSI in this
function (matching the mac implementation)

[Tim Song, 2014/05/09 19:01:35]

Done.

 }
 
 int BluetoothDeviceChromeOS::GetCurrentHostTransmitPower() const {
-  NOTIMPLEMENTED();
-  return kUnknownPower;
+  BluetoothDeviceClient::Properties* properties =
+      DBusThreadManager::Get()->GetBluetoothDeviceClient()->GetProperties(
+          object_path_);
+  DCHECK(properties);
+
+  return IsConnected() ? properties->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->tx_power_max.value() : kUnknownPower;
 }
 
 bool BluetoothDeviceChromeOS::IsPaired() const {
   BluetoothDeviceClient::Properties* properties =
       DBusThreadManager::Get()->GetBluetoothDeviceClient()->
           GetProperties(object_path_);
   DCHECK(properties);
 
   // Trusted devices are devices that don't support pairing but that the
   // user has explicitly connected; it makes no sense for UI purposes to
@@ skipping 293 matching lines @@
 void BluetoothDeviceChromeOS::OnConnect(bool after_pairing,
                                         const base::Closure& callback) {
   if (--num_connecting_calls_ == 0)
     adapter_->NotifyDeviceChanged(this);
 
   DCHECK(num_connecting_calls_ >= 0);
   VLOG(1) << object_path_.value() << ": Connected, " << num_connecting_calls_
         << " still in progress";
 
   SetTrusted();
+  StartConnectionMonitor();

[keybuk, 2014/05/09 00:35:25]

NAK, doing a connection monitor for every single paired device is expensive with
multiple round-trips to the controller

This should be something enabled on a per-device basis

[Tim Song, 2014/05/09 02:55:29]

In that case, should we add an API in chrome.bluetooth, and I guess the
BluetoothDevice interface, to enable connection monitoring?

How would this work for other platforms, like Mac, which doesn't have system
supported polling? Should we do the polling in Chrome to make the interface
consistent?

[keybuk, 2014/05/09 18:22:07]

Yes.

[Tim Song, 2014/05/09 19:01:35]

Okay, I'll add this API function in the other CL.

 
   if (after_pairing)
     UMA_HISTOGRAM_ENUMERATION("Bluetooth.PairingResult",
                               UMA_PAIRING_RESULT_SUCCESS,
                               UMA_PAIRING_RESULT_COUNT);
 
   callback.Run();
 }
 
 void BluetoothDeviceChromeOS::OnConnectError(
@@ skipping 87 matching lines @@
           true,
           base::Bind(&BluetoothDeviceChromeOS::OnSetTrusted,
                      weak_ptr_factory_.GetWeakPtr()));
 }
 
 void BluetoothDeviceChromeOS::OnSetTrusted(bool success) {
   LOG_IF(WARNING, !success) << object_path_.value()
                             << ": 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();
 }
 
 void BluetoothDeviceChromeOS::OnDisconnectError(
     const ErrorCallback& error_callback,
     const std::string& error_name,
     const std::string& error_message) {
   LOG(WARNING) << object_path_.value() << ": Failed to disconnect device: "
@@ skipping 27 matching lines @@
     const std::string& error_message) {
   BluetoothProfileChromeOS* profile_chromeos =
       static_cast<BluetoothProfileChromeOS*>(profile);
   VLOG(1) << object_path_.value() << ": Profile connection failed: "
           << profile_chromeos->uuid().canonical_value() << ": "
           << error_name << ": " << error_message;
   error_callback.Run(error_message);
 }
 
 }  // namespace chromeos