bluetooth: android: Implement & test CreateGattConnection.

device/bluetooth/bluetooth_device_android.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "device/bluetooth/bluetooth_device_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "device/bluetooth/bluetooth_adapter_android.h"
 #include "jni/ChromeBluetoothDevice_jni.h"
 
 using base::android::AttachCurrentThread;
 using base::android::AppendJavaStringArrayToStringVector;
 
 namespace device {
 
 BluetoothDeviceAndroid* BluetoothDeviceAndroid::Create(
     BluetoothAdapterAndroid* adapter,
     jobject bluetooth_device_wrapper) {  // Java Type: bluetoothDeviceWrapper
   BluetoothDeviceAndroid* device = new BluetoothDeviceAndroid(adapter);
 
   device->j_device_.Reset(Java_ChromeBluetoothDevice_create(
-      AttachCurrentThread(), bluetooth_device_wrapper));
+      AttachCurrentThread(), reinterpret_cast<intptr_t>(device),
+      bluetooth_device_wrapper));
 
   return device;
 }
 
 BluetoothDeviceAndroid::~BluetoothDeviceAndroid() {
 }
 
 bool BluetoothDeviceAndroid::UpdateAdvertisedUUIDs(jobject advertised_uuids) {
   return Java_ChromeBluetoothDevice_updateAdvertisedUUIDs(
       AttachCurrentThread(), j_device_.obj(), advertised_uuids);
 }
 
 // static
 bool BluetoothDeviceAndroid::RegisterJNI(JNIEnv* env) {
   return RegisterNativesImpl(env);  // Generated in ChromeBluetoothDevice_jni.h
 }
 
+base::android::ScopedJavaLocalRef<jobject>
+BluetoothDeviceAndroid::GetJavaObject() {
+  return base::android::ScopedJavaLocalRef<jobject>(j_device_);
+}
+
 uint32 BluetoothDeviceAndroid::GetBluetoothClass() const {
   return Java_ChromeBluetoothDevice_getBluetoothClass(AttachCurrentThread(),
                                                       j_device_.obj());
 }
 
 std::string BluetoothDeviceAndroid::GetAddress() const {
   return ConvertJavaStringToUTF8(Java_ChromeBluetoothDevice_getAddress(
       AttachCurrentThread(), j_device_.obj()));
 }
 
@@ skipping 129 matching lines @@
   NOTIMPLEMENTED();
 }
 
 void BluetoothDeviceAndroid::ConnectToServiceInsecurely(
     const BluetoothUUID& uuid,
     const ConnectToServiceCallback& callback,
     const ConnectToServiceErrorCallback& error_callback) {
   NOTIMPLEMENTED();
 }
 
+void BluetoothDeviceAndroid::OnConnectionStateChange(JNIEnv* env,
+                                                     jobject jcaller,
+                                                     int32_t status,
+                                                     bool connected) {
+  gatt_connected_ = connected;
+  if (gatt_connected_) {
+    DidConnectGatt();
+  } else {
+    switch (status) {   // Constants are from android.bluetooth.BluetoothGatt.
+      case 0x00000101:  // GATT_FAILURE
+        return DidFailToConnectGatt(ERROR_FAILED);
+      case 0x00000005:  // GATT_INSUFFICIENT_AUTHENTICATION
+        return DidFailToConnectGatt(ERROR_AUTH_FAILED);
+      case 0x00000000:  // GATT_SUCCESS
+        return DidDisconnectGatt();
+      default:
+        return DidFailToConnectGatt(ERROR_UNKNOWN);

[Jeffrey Yasskin, 2015/08/20 21:35:14]

Log here so we know what error to add a translation for.

[scheib, 2015/09/13 02:41:01]

Done.

+    }
+  }
 }
 
 BluetoothDeviceAndroid::BluetoothDeviceAndroid(BluetoothAdapterAndroid* adapter)
     : BluetoothDevice(adapter) {}
 
 std::string BluetoothDeviceAndroid::GetDeviceName() const {
   return ConvertJavaStringToUTF8(Java_ChromeBluetoothDevice_getDeviceName(
       AttachCurrentThread(), j_device_.obj()));
 }
 
 void BluetoothDeviceAndroid::CreateGattConnectionImpl() {
-  // Implemented in following patch https://codereview.chromium.org/1256313002
-  NOTIMPLEMENTED();
-  DidFailToConnectGatt(ERROR_UNKNOWN);
+  if (!Java_ChromeBluetoothDevice_createGattConnectionImpl(
+          AttachCurrentThread(), j_device_.obj(),
+          base::android::GetApplicationContext()))
+    DidFailToConnectGatt(ERROR_UNKNOWN);

[Jeffrey Yasskin, 2015/08/20 21:35:14]

Pick a better error enum.

[scheib, 2015/09/13 02:41:01]

Done. This method no longer has synchronous errors reported because
BluetoothGatt.connect() is no longer being used.

 }
 
 void BluetoothDeviceAndroid::DisconnectGatt() {
-  // Implemented in following patch https://codereview.chromium.org/1256313002
-  NOTIMPLEMENTED();
+  Java_ChromeBluetoothDevice_disconnectGatt(AttachCurrentThread(),
+                                            j_device_.obj());
 }
 
 }  // namespace device