diff options
| author | Matthew Xie <mattx@google.com> | 2013-05-28 22:27:44 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-28 22:27:44 -0700 |
| commit | 897d98a7530109bff8d73b3651d8884c76f54c42 (patch) | |
| tree | 0bfda31e3fb76a26398f98b2f0c9e23b9ec542fd /core/java/android | |
| parent | a1f49d8bb77db20617f9ea372ad9f1a9e06deece (diff) | |
| parent | 6ea0636a9c6e3661d6a9ac443eba5b9b6a0d7354 (diff) | |
| download | frameworks_base-897d98a7530109bff8d73b3651d8884c76f54c42.zip frameworks_base-897d98a7530109bff8d73b3651d8884c76f54c42.tar.gz frameworks_base-897d98a7530109bff8d73b3651d8884c76f54c42.tar.bz2 | |
am 6ea0636a: Merge "Revert "Revert "Change GATT_FAILURE from 0 to 0x101""" into jb-mr2-dev
* commit '6ea0636a9c6e3661d6a9ac443eba5b9b6a0d7354':
Revert "Revert "Change GATT_FAILURE from 0 to 0x101""
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/bluetooth/BluetoothGatt.java | 6 |
1 files changed, 3 insertions, 3 deletions
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<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 |