Merge pull request #612 from NordicSemiconductor/improvement/errors

New error codes

Author: philips77

ble/src/main/java/no/nordicsemi/android/ble/BleManagerHandler.java

@@ -93,7 +93,7 @@ abstract class BleManagerHandler extends RequestHandler {
 	private boolean initialization;
 
 	/**
-	 * A time after which receiving 133 error is considered a timeout, instead of a
+	 * A time after which receiving 133 or 147 error is considered a timeout, instead of a
 	 * different reason.
 	 * A {@link BluetoothDevice#connectGatt(Context, boolean, BluetoothGattCallback)} call will
 	 * fail after 30 seconds if the device won't be found until then. Other errors happen much
@@ -2329,7 +2329,7 @@ public void onConnectionStateChange(@NonNull final BluetoothGatt gatt,
 							reason = FailCallback.REASON_DEVICE_NOT_SUPPORTED;
 						else if (status == BluetoothGatt.GATT_SUCCESS)
 							reason = FailCallback.REASON_DEVICE_DISCONNECTED;
-						else if (status == GattError.GATT_ERROR && timeout)
+						else if ((status == GattError.GATT_ERROR || status == GattError.GATT_TIMEOUT) && timeout)
 							reason = FailCallback.REASON_TIMEOUT;
 						else
 							reason = status;

ble/src/main/java/no/nordicsemi/android/ble/error/GattError.java

@@ -42,22 +42,31 @@ public class GattError {
 	public static final int GATT_ERROR = 0x0085; // Device not reachable
 
 	public static final int GATT_INVALID_HANDLE = 0x0001;
+	// https://developer.android.com/reference/android/bluetooth/BluetoothGatt#GATT_READ_NOT_PERMITTED
 	public static final int GATT_READ_NOT_PERMIT = 0x0002;
+	// https://developer.android.com/reference/android/bluetooth/BluetoothGatt#GATT_WRITE_NOT_PERMITTED
 	public static final int GATT_WRITE_NOT_PERMIT = 0x0003;
 	public static final int GATT_INVALID_PDU = 0x0004;
+	// https://developer.android.com/reference/android/bluetooth/BluetoothGatt#GATT_INSUFFICIENT_AUTHENTICATION
 	public static final int GATT_INSUF_AUTHENTICATION = 0x0005;
+	// https://developer.android.com/reference/android/bluetooth/BluetoothGatt#GATT_REQUEST_NOT_SUPPORTED
 	public static final int GATT_REQ_NOT_SUPPORTED = 0x0006;
+	// https://developer.android.com/reference/android/bluetooth/BluetoothGatt#GATT_INVALID_OFFSET
 	public static final int GATT_INVALID_OFFSET = 0x0007;
+	// https://developer.android.com/reference/android/bluetooth/BluetoothGatt#GATT_INSUFFICIENT_AUTHORIZATION
 	public static final int GATT_INSUF_AUTHORIZATION = 0x0008;
 	public static final int GATT_PREPARE_Q_FULL = 0x0009;
 	public static final int GATT_NOT_FOUND = 0x000a;
 	public static final int GATT_NOT_LONG = 0x000b;
 	public static final int GATT_INSUF_KEY_SIZE = 0x000c;
+	// https://developer.android.com/reference/android/bluetooth/BluetoothGatt#GATT_INVALID_ATTRIBUTE_LENGTH
 	public static final int GATT_INVALID_ATTR_LEN = 0x000d;
 	public static final int GATT_ERR_UNLIKELY = 0x000e;
+	// https://developer.android.com/reference/android/bluetooth/BluetoothGatt#GATT_INSUFFICIENT_ENCRYPTION
 	public static final int GATT_INSUF_ENCRYPTION = 0x000f;
 	public static final int GATT_UNSUPPORT_GRP_TYPE = 0x0010;
 	public static final int GATT_INSUF_RESOURCE = 0x0011;
+	public static final int GATT_PAIRING_WITH_UNIT_KEY_NOT_SUPPORTED = 0x0029;
 	public static final int GATT_CONTROLLER_BUSY = 0x003A;
 	public static final int GATT_UNACCEPT_CONN_INTERVAL = 0x003B;
 	public static final int GATT_ILLEGAL_PARAMETER = 0x0087;
@@ -74,7 +83,10 @@ public class GattError {
 	public static final int GATT_SERVICE_STARTED = 0x008c;
 	public static final int GATT_ENCRYPTED_NO_MITM = 0x008d;
 	public static final int GATT_NOT_ENCRYPTED = 0x008e;
+	// https://developer.android.com/reference/android/bluetooth/BluetoothGatt#GATT_CONNECTION_CONGESTED
 	public static final int GATT_CONGESTED = 0x008f;
+	// https://developer.android.com/reference/android/bluetooth/BluetoothGatt#GATT_CONNECTION_TIMEOUT
+	public static final int GATT_TIMEOUT = 0x0093;
 	public static final int GATT_CCCD_CFG_ERROR = 0x00FD;
 	public static final int GATT_PROCEDURE_IN_PROGRESS = 0x00FE;
 	public static final int GATT_VALUE_OUT_OF_RANGE = 0x00FF;
@@ -99,6 +111,8 @@ public static String parseConnectionError(final int error) {
 			case GATT_CONN_LMP_TIMEOUT -> "GATT CONN LMP TIMEOUT";
 			case GATT_CONN_CANCEL -> "GATT CONN CANCEL ";
 			case GATT_ERROR -> "GATT ERROR"; // Device not reachable
+			case GATT_TIMEOUT -> "GATT TIMEOUT"; // Device not reachable, new Error added in Android 15
+			case GATT_PAIRING_WITH_UNIT_KEY_NOT_SUPPORTED -> "GATT PAIRING WITH UNIT KEY NOT SUPPORTED";
 			default -> "UNKNOWN (" + error + ")";
 		};
 	}
@@ -129,6 +143,7 @@ public static String parse(final int error) {
 			case GATT_INSUF_ENCRYPTION -> "GATT INSUF ENCRYPTION";
 			case GATT_UNSUPPORT_GRP_TYPE -> "GATT UNSUPPORT GRP TYPE";
 			case GATT_INSUF_RESOURCE -> "GATT INSUF RESOURCE";
+			case GATT_PAIRING_WITH_UNIT_KEY_NOT_SUPPORTED -> "GATT PAIRING WITH UNIT KEY NOT SUPPORTED";
 			case GATT_CONN_LMP_TIMEOUT -> "GATT CONN LMP TIMEOUT";
 			case GATT_CONTROLLER_BUSY -> "GATT CONTROLLER BUSY";
 			case GATT_UNACCEPT_CONN_INTERVAL -> "GATT UNACCEPT CONN INTERVAL";
@@ -148,6 +163,7 @@ public static String parse(final int error) {
 			case GATT_ENCRYPTED_NO_MITM -> "GATT ENCRYPTED NO MITM";
 			case GATT_NOT_ENCRYPTED -> "GATT NOT ENCRYPTED";
 			case GATT_CONGESTED -> "GATT CONGESTED";
+			case GATT_TIMEOUT -> "GATT TIMEOUT";
 			case GATT_CCCD_CFG_ERROR -> "GATT CCCD CFG ERROR";
 			case GATT_PROCEDURE_IN_PROGRESS -> "GATT PROCEDURE IN PROGRESS";
 			case GATT_VALUE_OUT_OF_RANGE -> "GATT VALUE OUT OF RANGE";