bluetooth: Invalidate connection objects if a connection fails and add histograms

device/bluetooth/test/bluetooth_test_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/test/bluetooth_test_android.h"
 
 #include <iterator>
 #include <sstream>
 
 #include "base/android/jni_array.h"
@@ skipping 66 matching lines @@
       static_cast<BluetoothDeviceAndroid*>(device);
 
   Java_FakeBluetoothDevice_connectionStateChange(
       AttachCurrentThread(), device_android->GetJavaObject().obj(),
       0,      // android.bluetooth.BluetoothGatt.GATT_SUCCESS
       true);  // connected
 }
 
 void BluetoothTestAndroid::SimulateGattConnectionError(
     BluetoothDevice* device,
-    BluetoothDevice::ConnectErrorCode error) {
-  int android_error_value = 0;
-  switch (error) {  // Constants are from android.bluetooth.BluetoothGatt.
-    case BluetoothDevice::ERROR_ATTRIBUTE_LENGTH_INVALID:
-      android_error_value = 0x0000000d;  // GATT_INVALID_ATTRIBUTE_LENGTH
-      break;
-    case BluetoothDevice::ERROR_AUTH_FAILED:
-      android_error_value = 0x00000005;  // GATT_INSUFFICIENT_AUTHENTICATION
-      break;
-    case BluetoothDevice::ERROR_CONNECTION_CONGESTED:
-      android_error_value = 0x0000008f;  // GATT_CONNECTION_CONGESTED
-      break;
-    case BluetoothDevice::ERROR_FAILED:
-      android_error_value = 0x00000101;  // GATT_FAILURE
-      break;
-    case BluetoothDevice::ERROR_INSUFFICIENT_ENCRYPTION:
-      android_error_value = 0x0000000f;  // GATT_INSUFFICIENT_ENCRYPTION
-      break;
-    case BluetoothDevice::ERROR_OFFSET_INVALID:
-      android_error_value = 0x00000007;  // GATT_INVALID_OFFSET
-      break;
-    case BluetoothDevice::ERROR_READ_NOT_PERMITTED:
-      android_error_value = 0x00000002;  // GATT_READ_NOT_PERMITTED
-      break;
-    case BluetoothDevice::ERROR_REQUEST_NOT_SUPPORTED:
-      android_error_value = 0x00000006;  // GATT_REQUEST_NOT_SUPPORTED
-      break;
-    case BluetoothDevice::ERROR_WRITE_NOT_PERMITTED:
-      android_error_value = 0x00000003;  // GATT_WRITE_NOT_PERMITTED
-      break;
-    case BluetoothDevice::ERROR_AUTH_CANCELED:
-    case BluetoothDevice::ERROR_AUTH_REJECTED:
-    case BluetoothDevice::ERROR_AUTH_TIMEOUT:
-    case BluetoothDevice::ERROR_INPROGRESS:
-    case BluetoothDevice::ERROR_UNKNOWN:
-    case BluetoothDevice::ERROR_UNSUPPORTED_DEVICE:
-    case BluetoothDevice::NUM_CONNECT_ERROR_CODES:
-      NOTREACHED() << "No translation for error code: " << error;
-  }
-
+    BluetoothDevice::ConnectErrorCode) {
   BluetoothDeviceAndroid* device_android =
       static_cast<BluetoothDeviceAndroid*>(device);
 
   Java_FakeBluetoothDevice_connectionStateChange(
       AttachCurrentThread(), device_android->GetJavaObject().obj(),
-      android_error_value,
+      // TODO(ortuno): Add all types of errors Android can produce. For now we
+      // just return a timeout error.
+      // http://crbug.com/578191
+      0x08,    // Connection Timeout from Bluetooth Spec.
       false);  // connected
 }
 
 void BluetoothTestAndroid::SimulateGattDisconnection(BluetoothDevice* device) {
   BluetoothDeviceAndroid* device_android =
       static_cast<BluetoothDeviceAndroid*>(device);
 
   Java_FakeBluetoothDevice_connectionStateChange(
       AttachCurrentThread(), device_android->GetJavaObject().obj(),
-      0,       // android.bluetooth.BluetoothGatt.GATT_SUCCESS
+      0x13,    // Connection terminate by peer user from Bluetooth Spec.
       false);  // disconnected
 }
 
 void BluetoothTestAndroid::SimulateGattServicesDiscovered(
     BluetoothDevice* device,
     const std::vector<std::string>& uuids) {
   BluetoothDeviceAndroid* device_android =
       static_cast<BluetoothDeviceAndroid*>(device);
   JNIEnv* env = base::android::AttachCurrentThread();
 
@@ skipping 209 matching lines @@
 
 void BluetoothTestAndroid::OnFakeBluetoothGattWriteDescriptor(
     JNIEnv* env,
     const JavaParamRef<jobject>& caller,
     const JavaParamRef<jbyteArray>& value) {
   gatt_write_descriptor_attempts_++;
   base::android::JavaByteArrayToByteVector(env, value, &last_write_value_);
 }
 
 }  // namespace device