bluetooth:android: Return the advertised name if advertising

device/bluetooth/bluetooth_device.h

 // 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.
 
 #ifndef DEVICE_BLUETOOTH_BLUETOOTH_DEVICE_H_
 #define DEVICE_BLUETOOTH_BLUETOOTH_DEVICE_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 220 matching lines @@
   virtual uint16_t GetProductID() const = 0;
 
   // Returns the Device ID of the device, typically the release or version
   // number in BCD format, where available.
   virtual uint16_t GetDeviceID() const = 0;
 
   // Returns the appearance of the device.
   virtual uint16_t GetAppearance() const = 0;
 
   // Returns the name of the device, which may be empty.
+  //
+  // On Android: If the device is connected we retrieve the name from the system
+  // but if the device is not connected we use the name in the last advertising
+  // packet. We do this because the function to retrieve the name takes several
+  // ms on Android.
   virtual base::Optional<std::string> GetName() const = 0;
 
   // Returns the name of the device suitable for displaying, this may
   // be a synthesized string containing the address and localized type name
   // if the device has no obtained name.
   virtual base::string16 GetNameForDisplay() const;
 
   // Returns the type of the device, limited to those we support or are
   // aware of, by decoding the bluetooth class information. The returned
   // values are unique, and do not overlap, so DEVICE_KEYBOARD is not also
@@ skipping 291 matching lines @@
   // Update the last time this device was seen.
   void UpdateTimestamp();
 
   // Returns the time of the last call to UpdateTimestamp(), or base::Time() if
   // it hasn't been called yet.
   virtual base::Time GetLastUpdateTime() const;
 
   // Called by BluetoothAdapter when a new Advertisement is seen for this
   // device. This replaces previously seen Advertisement Data.
   void UpdateAdvertisementData(int8_t rssi,
+                               const std::string* advertised_name,
                                UUIDList advertised_uuids,
                                ServiceDataMap service_data,
                                const int8_t* tx_power);
 
   // Called by BluetoothAdapter when it stops discoverying.
   void ClearAdvertisementData();
 
   // Return associated BluetoothAdapter.
   BluetoothAdapter* GetAdapter() { return adapter_; }
 
@@ skipping 80 matching lines @@
   // specific pointers via adapter_.
   BluetoothAdapter* adapter_;
 
   // Callbacks for pending success and error result of CreateGattConnection.
   std::vector<GattConnectionCallback> create_gatt_connection_success_callbacks_;
   std::vector<ConnectErrorCallback> create_gatt_connection_error_callbacks_;
 
   // BluetoothGattConnection objects keeping the GATT connection alive.
   std::set<BluetoothGattConnection*> gatt_connections_;
 
+  base::Optional<std::string> advertised_name_;
+
   GattServiceMap gatt_services_;
   bool gatt_services_discovery_complete_;
 
   // Received Signal Strength Indicator of the advertisement received.
   base::Optional<int8_t> inquiry_rssi_;
 
   // Tx Power advertised by the device.
   base::Optional<int8_t> inquiry_tx_power_;
 
   // Advertising Data flags of the device.
@@ skipping 13 matching lines @@
 
  private:
   // Returns a localized string containing the device's bluetooth address and
   // a device type for display when |name_| is empty.
   base::string16 GetAddressWithLocalizedDeviceTypeName() const;
 };
 
 }  // namespace device
 
 #endif  // DEVICE_BLUETOOTH_BLUETOOTH_DEVICE_H_