bluetooth:android: Return the advertised name if advertising

device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothAdapter.java

 // 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.
 
 package org.chromium.device.bluetooth;
 
 import android.annotation.TargetApi;
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.le.ScanSettings;
 import android.content.BroadcastReceiver;
@@ skipping 238 matching lines @@
                 uuid_strings = new String[] {};
             } else {
                 uuid_strings = new String[uuids.size()];
                 for (int i = 0; i < uuids.size(); i++) {
                     uuid_strings[i] = uuids.get(i).toString();
                 }
             }
 
             nativeCreateOrUpdateDeviceOnScan(mNativeBluetoothAdapterAndroid,
                     result.getDevice().getAddress(), result.getDevice(), result.getRssi(),
-                    uuid_strings, result.getScanRecord_getTxPowerLevel());
+                    result.getScanRecord_getDeviceName(), uuid_strings,
+                    result.getScanRecord_getTxPowerLevel());
         }
 
         @Override
         public void onScanFailed(int errorCode) {
             Log.w(TAG, "onScanFailed: %d", errorCode);
             nativeOnScanFailed(mNativeBluetoothAdapterAndroid);
         }
     }
 
     @Override
@@ skipping 39 matching lines @@
     // BluetoothAdapterAndroid C++ methods declared for access from java:
 
     // Binds to BluetoothAdapterAndroid::OnScanFailed.
     private native void nativeOnScanFailed(long nativeBluetoothAdapterAndroid);
 
     // Binds to BluetoothAdapterAndroid::CreateOrUpdateDeviceOnScan.
     // 'Object' type must be used for |bluetoothDeviceWrapper| because inner class
     // Wrappers.BluetoothDeviceWrapper reference is not handled by jni_generator.py JavaToJni.
     // http://crbug.com/505554
     private native void nativeCreateOrUpdateDeviceOnScan(long nativeBluetoothAdapterAndroid,
-            String address, Object bluetoothDeviceWrapper, int rssi, String[] advertisedUuids,
-            int txPower);
+            String address, Object bluetoothDeviceWrapper, int rssi, String advertisedName,
+            String[] advertisedUuids, int txPower);
 
     // Binds to BluetoothAdapterAndroid::nativeOnAdapterStateChanged
     private native void nativeOnAdapterStateChanged(
             long nativeBluetoothAdapterAndroid, boolean powered);
 }