device/bluetooth/bluetooth_device_android.cc - Issue 1395783005: bluetooth: android: BluetoothRemoteGattServiceAndroid::GetUUID

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_device_android.cc

Issue 1395783005: bluetooth: android: BluetoothRemoteGattServiceAndroid::GetUUID (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

« device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothDevice.java ('K') | « device/bluetooth/bluetooth_device_android.h ('k') | device/bluetooth/bluetooth_device_unittest.cc » ('j') | device/bluetooth/bluetooth_device_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: device/bluetooth/bluetooth_device_android.cc

diff --git a/device/bluetooth/bluetooth_device_android.cc b/device/bluetooth/bluetooth_device_android.cc

index 1066ac4b39f822d44debff43ea26f974beaa9bfc..fccd24fb682780fa15fd134fae97db342178aeca 100644

--- a/device/bluetooth/bluetooth_device_android.cc

+++ b/device/bluetooth/bluetooth_device_android.cc

@@ -226,11 +226,12 @@ void BluetoothDeviceAndroid::OnConnectionStateChange(JNIEnv* env,

void BluetoothDeviceAndroid::CreateGattRemoteService(

JNIEnv* env,

jobject caller,

- int32_t instanceId,

+ const jstring& instanceId,

jobject bluetooth_gatt_service_wrapper // Java Type:

// BluetoothGattServiceWrapper

) {

- std::string instanceIdString = base::StringPrintf("%d", instanceId);

+ std::string instanceIdString =

+ base::android::ConvertJavaStringToUTF8(env, instanceId);

if (gatt_services_.contains(instanceIdString))

return;