bluetooth: android: Add BluetoothDevice::ConnectErrorCode enums

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 "base/strings/stringprintf.h"
@@ skipping 190 matching lines @@
 }
 
 void BluetoothDeviceAndroid::OnConnectionStateChange(JNIEnv* env,
                                                      jobject jcaller,
                                                      int32_t status,
                                                      bool connected) {
   gatt_connected_ = connected;
   if (gatt_connected_) {
     DidConnectGatt();
   } else {
-    // TODO(scheib) Create new BluetoothDevice::ConnectErrorCode enums for
-    // android values not yet represented. http://crbug.com/531058
     switch (status) {   // Constants are from android.bluetooth.BluetoothGatt.
+      case 0x0000008f:  // GATT_CONNECTION_CONGESTED
+        return DidFailToConnectGatt(ERROR_CONNECTION_CONGESTED);
       case 0x00000101:  // GATT_FAILURE
         return DidFailToConnectGatt(ERROR_FAILED);
       case 0x00000005:  // GATT_INSUFFICIENT_AUTHENTICATION
         return DidFailToConnectGatt(ERROR_AUTH_FAILED);
+      case 0x0000000f:  // GATT_INSUFFICIENT_ENCRYPTION
+        return DidFailToConnectGatt(ERROR_INSUFFICIENT_ENCRYPTION);
+      case 0x0000000d:  // GATT_INVALID_ATTRIBUTE_LENGTH
+        return DidFailToConnectGatt(ERROR_ATTRIBUTE_LENGTH_INVALID);
+      case 0x00000007:  // GATT_INVALID_OFFSET
+        return DidFailToConnectGatt(ERROR_OFFSET_INVALID);
+      case 0x00000002:  // GATT_READ_NOT_PERMITTED
+        return DidFailToConnectGatt(ERROR_READ_FAILED);
+      case 0x00000006:  // GATT_REQUEST_NOT_SUPPORTED
+        return DidFailToConnectGatt(ERROR_REQUEST_NOT_SUPPORTED);
       case 0x00000000:  // GATT_SUCCESS
         return DidDisconnectGatt();
+      case 0x00000003:  // GATT_WRITE_NOT_PERMITTED
+        return DidFailToConnectGatt(ERROR_WRITE_FAILED);

[Kai Jiang, 2015/11/29 10:40:51]

ERROR_WRITE_NOT_PERMITTED

       default:
         VLOG(1) << "Unhandled status: " << status;
         return DidFailToConnectGatt(ERROR_UNKNOWN);
     }
   }
 }
 
 void BluetoothDeviceAndroid::OnGattServicesDiscovered(JNIEnv* env,
                                                       jobject jcaller) {
   FOR_EACH_OBSERVER(BluetoothAdapter::Observer, GetAdapter()->GetObservers(),
@@ skipping 34 matching lines @@
       AttachCurrentThread(), j_device_.obj(),
       base::android::GetApplicationContext());
 }
 
 void BluetoothDeviceAndroid::DisconnectGatt() {
   Java_ChromeBluetoothDevice_disconnectGatt(AttachCurrentThread(),
                                             j_device_.obj());
 }
 
 }  // namespace device