From 90ca807f7b2037499112d1c49c4b0793cc780540 Mon Sep 17 00:00:00 2001 From: Matthew Xie Date: Tue, 28 May 2013 21:06:50 +0000 Subject: Revert "Revert "Change GATT_FAILURE from 0 to 0x101"" This reverts commit d21f674c150aa26c8094d1418108649f53f810e6 bug 9109238 Change-Id: Ie1fc3d7420e6c401d3db29499d8846e6b70a61bb --- api/current.txt | 2 +- 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 a9d0f57..e5fd378 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 bffe64b..f303206 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 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 -- cgit v1.1