bluetooth:android: Return the advertised name if advertising

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 162 matching lines @@
   MarkDiscoverySessionsAsInactive();
 }
 
 void BluetoothAdapterAndroid::CreateOrUpdateDeviceOnScan(
     JNIEnv* env,
     const JavaParamRef<jobject>& caller,
     const JavaParamRef<jstring>& address,
     const JavaParamRef<jobject>&
         bluetooth_device_wrapper,  // Java Type: bluetoothDeviceWrapper
     int32_t rssi,
+    const JavaParamRef<jstring>& device_name,
     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);
 
+  base::Optional<std::string> name =
+      device_name.is_null() ? base::nullopt
+                            : base::make_optional<std::string>(
+                                  ConvertJavaStringToUTF8(env, device_name));
+
   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)));
   }
 
   int8_t clamped_tx_power = BluetoothDevice::ClampPower(tx_power);
 
   device_android->UpdateAdvertisementData(
-      BluetoothDevice::ClampPower(rssi), std::move(advertised_bluetooth_uuids),
-      {} /* service_data */,
+      BluetoothDevice::ClampPower(rssi), name ? &name.value() : nullptr,
+      std::move(advertised_bluetooth_uuids), {} /* service_data */,
       // Android uses INT32_MIN to indicate no Advertised Tx Power.
       // https://developer.android.com/reference/android/bluetooth/le/ScanRecord.html#getTxPowerLevel()
       tx_power == INT32_MIN ? nullptr : &clamped_tx_power);
 
   if (is_new_device) {
     devices_.add(device_address, std::move(device_android_owner));
     for (auto& observer : observers_)
       observer.DeviceAdded(this, device_android);
   } else {
     for (auto& observer : observers_)
@@ skipping 98 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