bluetooth: Implement RSSI and Tx Power on macOS and Android

device/bluetooth/bluetooth_adapter_android.cc

 // Copyright 2015 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_adapter_android.h"
 
 #include <memory>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
@@ skipping 166 matching lines @@
   num_discovery_sessions_ = 0;
   MarkDiscoverySessionsAsInactive();
 }
 
 void BluetoothAdapterAndroid::CreateOrUpdateDeviceOnScan(
     JNIEnv* env,
     const JavaParamRef<jobject>& caller,
     const JavaParamRef<jstring>& address,
     const JavaParamRef<jobject>&
         bluetooth_device_wrapper,  // Java Type: bluetoothDeviceWrapper
-    const JavaParamRef<jobjectArray>&
-        advertised_uuids) {  // Java Type: String[]
+    int32_t rssi,
+    const JavaParamRef<jobjectArray>& advertised_uuids,  // Java Type: String[]
+    int32_t tx_power) {
   std::string device_address = ConvertJavaStringToUTF8(env, address);
   DevicesMap::const_iterator iter = devices_.find(device_address);
 
   bool is_new_device = false;
   std::unique_ptr<BluetoothDeviceAndroid> device_android_owner;
   BluetoothDeviceAndroid* device_android;
 
   if (iter == devices_.end()) {
     // New device.
     is_new_device = true;
     device_android_owner.reset(
         BluetoothDeviceAndroid::Create(this, bluetooth_device_wrapper));
     device_android = device_android_owner.get();
   } else {
     // Existing device.
     device_android = static_cast<BluetoothDeviceAndroid*>(iter->second);
   }
   DCHECK(device_android);
   std::vector<std::string> advertised_uuids_strings;
   AppendJavaStringArrayToStringVector(env, advertised_uuids,
                                       &advertised_uuids_strings);
-
   BluetoothDevice::UUIDList advertised_bluetooth_uuids;
   for (std::string& uuid : advertised_uuids_strings) {
     advertised_bluetooth_uuids.push_back(BluetoothUUID(std::move(uuid)));
   }
 
-  device_android->UpdateAdvertisementData(std::move(advertised_bluetooth_uuids),
-                                          {} /* service_data */);
+  // Android uses INT32_MIN to indicate no Advertised Tx Power.

[Jeffrey Yasskin, 2016/08/24 04:32:02]

Link to
https://developer.android.com/reference/android/bluetooth/le/ScanRecord.html#...
in the comment, I think.

[ortuno, 2016/08/24 21:29:09]

Done.

+  base::Optional<int8_t> clamped_tx_power =
+      tx_power == INT32_MIN
+          ? base::nullopt
+          : base::make_optional<int8_t>(BluetoothDevice::ClampPower(tx_power));
+
+  device_android->UpdateAdvertisementData(
+      BluetoothDevice::ClampPower(rssi), std::move(advertised_bluetooth_uuids),
+      {} /* service_data */,
+      clamped_tx_power ? &clamped_tx_power.value() : nullptr);

[Jeffrey Yasskin, 2016/08/24 04:32:02]

Should UpdateAdvertisementData take an optional, if you're unwrapping on in the
call?

[ortuno, 2016/08/24 21:29:09]

Hmmm I thought about passing an optional but base::Optional's documentation
recommends not to use it as a function parameter. WDYT?

https://chromium.googlesource.com/chromium/src/+/master/docs/optional.md#When...

[Jeffrey Yasskin, 2016/08/24 22:32:07]

As discussed over IM, it probably makes sense to store the clamped power in a
local variable, and put "tx_power == INT32_MIN ? nullptr : &clamped_tx_power"
here, instead of building an Optional. You could also add GetPtr(Optional) to
optional.h if you're feeling yak-shavy today.

[ortuno, 2016/08/25 16:42:34]

Done.
Not on a branch day :) Maybe once I move if it keeps coming up.

 
   if (is_new_device) {
     devices_.add(device_address, std::move(device_android_owner));
     FOR_EACH_OBSERVER(BluetoothAdapter::Observer, observers_,
                       DeviceAdded(this, device_android));
   } else {
     FOR_EACH_OBSERVER(BluetoothAdapter::Observer, observers_,
                       DeviceChanged(this, device_android));
   }
 }
@@ skipping 95 matching lines @@
   // TODO(scheib): Support filters crbug.com/490401
   NOTIMPLEMENTED();
   error_callback.Run(UMABluetoothDiscoverySessionOutcome::NOT_IMPLEMENTED);
 }
 
 void BluetoothAdapterAndroid::RemovePairingDelegateInternal(
     device::BluetoothDevice::PairingDelegate* pairing_delegate) {
 }
 
 }  // namespace device