device/bluetooth/bluetooth_remote_gatt_service_android.h - 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/bluetooth_remote_gatt_service_android.h

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/bluetooth/bluetooth_remote_gatt_characteristic_android.cc ('k') | device/bluetooth/bluetooth_remote_gatt_service_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: device/bluetooth/bluetooth_remote_gatt_service_android.h

diff --git a/device/bluetooth/bluetooth_remote_gatt_service_android.h b/device/bluetooth/bluetooth_remote_gatt_service_android.h

index b1d19e0dcd6ee790ba722c012961b98f1bf838aa..a8f1294a5329e4ac2a51fd6d535a940ef5faf73b 100644

--- a/device/bluetooth/bluetooth_remote_gatt_service_android.h

+++ b/device/bluetooth/bluetooth_remote_gatt_service_android.h

@@ -40,7 +40,7 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothRemoteGattServiceAndroid

BluetoothDeviceAndroid* device,

jobject bluetooth_remote_gatt_service_wrapper, // Java Type:

// BluetoothRemoteGattServiceWrapper

- std::string instanceId);

+ const std::string& instanceId);

// Register C++ methods exposed to Java using JNI.

static bool RegisterJNI(JNIEnv* env);

@@ -82,7 +82,7 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothRemoteGattServiceAndroid

BluetoothRemoteGattServiceAndroid(BluetoothAdapterAndroid* adapter,

BluetoothDeviceAndroid* device,

- std::string instanceId);

+ const std::string& instanceId);

~BluetoothRemoteGattServiceAndroid() override;

// Populates |characteristics_| from Java objects if necessary.

@@ -99,7 +99,7 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothRemoteGattServiceAndroid

// here since |device_| owns this instance.

BluetoothDeviceAndroid* device_;

- // Instance ID, cached from Android object.

+ // Adapter unique instance ID.

std::string instanceId_;

// Map of characteristics, keyed by characteristic identifier.