Merge "Revert "Change GATT_FAILURE from 0 to 0x101"" into jb-mr2-dev
diff --git a/api/current.txt b/api/current.txt
index e5fd378..a9d0f57 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -4923,7 +4923,7 @@
method public boolean setCharacteristicNotification(android.bluetooth.BluetoothGattCharacteristic, boolean);
method public boolean writeCharacteristic(android.bluetooth.BluetoothGattCharacteristic);
method public boolean writeDescriptor(android.bluetooth.BluetoothGattDescriptor);
- field public static final int GATT_FAILURE = 257; // 0x101
+ field public static final int GATT_FAILURE = 0; // 0x0
field public static final int GATT_INSUFFICIENT_AUTHENTICATION = 5; // 0x5
field public static final int GATT_INSUFFICIENT_ENCRYPTION = 15; // 0xf
field public static final int GATT_INVALID_ATTRIBUTE_LENGTH = 13; // 0xd
diff --git a/core/java/android/bluetooth/BluetoothGatt.java b/core/java/android/bluetooth/BluetoothGatt.java
index f303206..bffe64b 100644
--- a/core/java/android/bluetooth/BluetoothGatt.java
+++ b/core/java/android/bluetooth/BluetoothGatt.java
@@ -70,6 +70,9 @@
private List<BluetoothGattService> mServices;
+ /** A GATT operation failed */
+ public static final int GATT_FAILURE = 0;
+
/** A GATT operation completed successfully */
public static final int GATT_SUCCESS = 0;
@@ -94,9 +97,6 @@
/** A write operation exceeds the maximum length of the attribute */
public static final int GATT_INVALID_ATTRIBUTE_LENGTH = 0xd;
- /** A GATT operation failed, errors other than the above */
- public static final int GATT_FAILURE = 0x101;
-
/**
* No authentication required.
* @hide