diff options
| author | 2013-05-29 05:25:47 +0000 | |
|---|---|---|
| committer | 2013-05-29 05:25:47 +0000 | |
| commit | 6ea0636a9c6e3661d6a9ac443eba5b9b6a0d7354 (patch) | |
| tree | 9f0780c1603c2df13a79136451ce38ab7b18265a | |
| parent | 295eddb92fd6e137ae352ea8dace2ecd18bf0a8a (diff) | |
| parent | 90ca807f7b2037499112d1c49c4b0793cc780540 (diff) | |
Merge "Revert "Revert "Change GATT_FAILURE from 0 to 0x101""" into jb-mr2-dev
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/bluetooth/BluetoothGatt.java | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/api/current.txt b/api/current.txt index a9d0f5720863..e5fd37899f21 100644 --- a/api/current.txt +++ b/api/current.txt @@ -4923,7 +4923,7 @@ package android.bluetooth { 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 = 0; // 0x0 + field public static final int GATT_FAILURE = 257; // 0x101 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 bffe64b35702..f3032062cf0a 100644 --- a/core/java/android/bluetooth/BluetoothGatt.java +++ b/core/java/android/bluetooth/BluetoothGatt.java @@ -70,9 +70,6 @@ public final class BluetoothGatt implements BluetoothProfile { 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; @@ -97,6 +94,9 @@ public final class BluetoothGatt implements BluetoothProfile { /** 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 |