bluetooth:android: Return the advertised name if advertising

device/bluetooth/bluetooth_device.cc

 // Copyright (c) 2012 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.h"
 
 #include <iterator>
 #include <memory>
 #include <string>
 
@@ skipping 399 matching lines @@
 
       canonicalized[i] = base::ToUpperASCII(canonicalized[i]);
     }
   }
 
   return canonicalized;
 }
 
 std::string BluetoothDevice::GetIdentifier() const { return GetAddress(); }
 
-void BluetoothDevice::UpdateAdvertisementData(int8_t rssi,
-                                              UUIDList advertised_uuids,
-                                              ServiceDataMap service_data,
-                                              const int8_t* tx_power) {
+void BluetoothDevice::UpdateAdvertisementData(
+    int8_t rssi,
+    const std::string* advertised_name,
+    UUIDList advertised_uuids,
+    ServiceDataMap service_data,
+    const int8_t* tx_power) {
   UpdateTimestamp();
 
   inquiry_rssi_ = rssi;
 
+  if (advertised_name != nullptr) {
+    advertised_name_ = *advertised_name;
+  } else {
+    advertised_name_ = base::nullopt;
+  }
+
   device_uuids_.ReplaceAdvertisedUUIDs(std::move(advertised_uuids));
   service_data_ = std::move(service_data);
 
   if (tx_power != nullptr) {
     inquiry_tx_power_ = *tx_power;
   } else {
     inquiry_tx_power_ = base::nullopt;
   }
 }
 
 void BluetoothDevice::ClearAdvertisementData() {
   inquiry_rssi_ = base::nullopt;
+  advertised_name_ = base::nullopt;
   device_uuids_.ClearAdvertisedUUIDs();
   service_data_.clear();
   inquiry_tx_power_ = base::nullopt;
   GetAdapter()->NotifyDeviceChanged(this);
 }
 
 void BluetoothDevice::DidConnectGatt() {
   for (const auto& callback : create_gatt_connection_success_callbacks_) {
     callback.Run(
         base::MakeUnique<BluetoothGattConnection>(adapter_, GetAddress()));
@@ skipping 65 matching lines @@
   if (power < INT8_MIN) {
     return INT8_MIN;
   }
   if (power > INT8_MAX) {
     return INT8_MAX;
   }
   return static_cast<int8_t>(power);
 }
 
 }  // namespace device