bluetooth: Clean up connection errors

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/context_utils.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/metrics/histogram_macros.h"
@@ skipping 198 matching lines @@
     int32_t status,
     bool connected) {
   gatt_connected_ = connected;
   if (gatt_connected_) {
     RecordConnectionSuccessResult(status);
     DidConnectGatt();
   } else if (!create_gatt_connection_error_callbacks_.empty()) {
     // We assume that if there are any pending connection callbacks there
     // was a failed connection attempt.
     RecordConnectionFailureResult(status);
-    // TODO(ortuno): Return an error code based on |status|
-    // http://crbug.com/578191
-    DidFailToConnectGatt(ERROR_FAILED);
+
+    // The following errors are based on errors seen in the wild.

[scheib, 2017/03/07 06:20:22]

I'm wondering if this patch has too many changes at once.

[ortuno, 2017/03/08 01:46:10]

I think it does. Removed changes to android.

+    // They are cross referenced to Android errors, BT Spec errors,
+    // and Bluedroid error where relevant.
+    //   - Android errors:
+    //     https://developer.android.com/reference/android/bluetooth/BluetoothGatt.html
+    //   - BT Spec 5.0 [Vol 2, Part D] 2 Error Code Descriptions
+    //   - Bluedroid: stack/include/gatt_api.h
+    switch (status) {
+      case 0x00000000:  // Bluedroid: GATT_SUCCESS
+      case 0x00000085:  // Bluedroid: GATT_ERROR
+        DidFailToConnectGatt(ERROR_FAILED);
+        return;
+      case 0x00000087:  // Bluedroid GATT_PENDING
+        DidFailToConnectGatt(ERROR_INPROGRESS);
+        return;
+      default:
+        DidFailToConnectGatt(ERROR_UNKNOWN);
+        return;
+    }
   } else {
     // Otherwise an existing connection was terminated.
     RecordConnectionTerminatedResult(status);
     DidDisconnectGatt(true /* notifyDeviceChanged */);
   }
 }
 
 void BluetoothDeviceAndroid::OnGattServicesDiscovered(
     JNIEnv* env,
     const JavaParamRef<jobject>& jcaller) {
@@ skipping 31 matching lines @@
 void BluetoothDeviceAndroid::CreateGattConnectionImpl() {
   Java_ChromeBluetoothDevice_createGattConnectionImpl(
       AttachCurrentThread(), j_device_, base::android::GetApplicationContext());
 }
 
 void BluetoothDeviceAndroid::DisconnectGatt() {
   Java_ChromeBluetoothDevice_disconnectGatt(AttachCurrentThread(), j_device_);
 }
 
 }  // namespace device