Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1267)

Unified Diff: device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothAdapter.java

Issue 2377513004: bluetooth:android: Return the advertised name if advertising (Closed)
Patch Set: Format' Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | device/bluetooth/android/java/src/org/chromium/device/bluetooth/Wrappers.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothAdapter.java
diff --git a/device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothAdapter.java b/device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothAdapter.java
index d6a3eb0644995778f1e05821469b10971ab4635c..9bb2350e8bc2c4a8dca90583e96a3bcc5c210b6f 100644
--- a/device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothAdapter.java
+++ b/device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothAdapter.java
@@ -256,7 +256,8 @@ final class ChromeBluetoothAdapter extends BroadcastReceiver {
nativeCreateOrUpdateDeviceOnScan(mNativeBluetoothAdapterAndroid,
result.getDevice().getAddress(), result.getDevice(), result.getRssi(),
- uuid_strings, result.getScanRecord_getTxPowerLevel());
+ result.getScanRecord_getDeviceName(), uuid_strings,
+ result.getScanRecord_getTxPowerLevel());
}
@Override
@@ -316,8 +317,8 @@ final class ChromeBluetoothAdapter extends BroadcastReceiver {
// 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(
« no previous file with comments | « no previous file | device/bluetooth/android/java/src/org/chromium/device/bluetooth/Wrappers.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698