summaryrefslogtreecommitdiffstats
path: root/device/bluetooth/bluetooth_device_android.h
diff options
context:
space:
mode:
authorscheib <scheib@chromium.org>2015-10-15 18:23:15 -0700
committerCommit bot <commit-bot@chromium.org>2015-10-16 01:23:46 +0000
commit33aa3f45ab74c7d832cc9f717be85abb7bb53011 (patch)
tree388c007229b5d2e3677a728aa5721e44627f9115 /device/bluetooth/bluetooth_device_android.h
parentd4b788f7c8a5c6523fd0d01a4e7aa64f1e9dd624 (diff)
downloadchromium_src-33aa3f45ab74c7d832cc9f717be85abb7bb53011.zip
chromium_src-33aa3f45ab74c7d832cc9f717be85abb7bb53011.tar.gz
chromium_src-33aa3f45ab74c7d832cc9f717be85abb7bb53011.tar.bz2
bluetooth: android: BluetoothRemoteGattServiceAndroid::GetUUID
Create a Java class ChromeBluetoothRemoteGattService to implement BluetoothRemoteGattServiceAndroid, and implement GetUUID. Correct mistaken implementation of instanceID. Android's getInstanceId is only unique for services with the same UUID, so a device unique instance ID must join the UUID and Android's getInstanceId. Add the ability for tests to create services by providing a vector of UUID strings. BUG=541400 Review URL: https://codereview.chromium.org/1395783005 Cr-Commit-Position: refs/heads/master@{#354420}
Diffstat (limited to 'device/bluetooth/bluetooth_device_android.h')
-rw-r--r--device/bluetooth/bluetooth_device_android.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/device/bluetooth/bluetooth_device_android.h b/device/bluetooth/bluetooth_device_android.h
index e830e94..bed6780 100644
--- a/device/bluetooth/bluetooth_device_android.h
+++ b/device/bluetooth/bluetooth_device_android.h
@@ -99,7 +99,7 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothDeviceAndroid final
void CreateGattRemoteService(
JNIEnv* env,
jobject caller,
- int32_t instanceId,
+ const jstring& instanceId,
jobject bluetooth_gatt_service_wrapper); // Java Type:
// BluetoothGattServiceWrapper