device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothDevice.java - Issue 1412963004: bluetooth: android: Implement Characteristic GetIdentifier, fix Service IDs too.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1412963004: bluetooth: android: Implement Characteristic GetIdentifier, fix Service IDs too. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 2 months 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 | « device/BUILD.gn ('k') | device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothRemoteGattService.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothDevice.java

diff --git a/device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothDevice.java b/device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothDevice.java

index 382f75c5d179c0fa15689a8491afef666eb0193f..7d60844456c6316c75f6203f8282dfec2c3345f8 100644

--- a/device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothDevice.java

+++ b/device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothDevice.java

@@ -160,12 +160,10 @@ final class ChromeBluetoothDevice {

if (mNativeBluetoothDeviceAndroid != 0) {

for (Wrappers.BluetoothGattServiceWrapper service :

mBluetoothGatt.getServices()) {

- // Create a device unique service ID. getInstanceId only differs

- // between service instances with the same UUID.

- // TODO(scheib): Make instance IDs unique to the whole adapter.

- // http://crbug.com/546747

- String serviceInstanceId =

- service.getUuid().toString() + service.getInstanceId();

+ // Create an adapter unique service ID. getInstanceId only differs

+ // between service instances with the same UUID on this device.

+ String serviceInstanceId = getAddress() + "/"

+ + service.getUuid().toString() + "," + service.getInstanceId();

nativeCreateGattRemoteService(

mNativeBluetoothDeviceAndroid, serviceInstanceId, service);

}