diff options
| author | Matthew Xie <mattx@google.com> | 2013-05-26 20:19:05 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-05-26 20:19:06 +0000 |
| commit | 413f62930003d4ff20e29fd3bbfaf2d163a08ac1 (patch) | |
| tree | 65d66b17a6131315679d3ac7ca87ada90da80efe /core/java/android | |
| parent | b830d527deb75a36aa78367026d6631a9b4e1126 (diff) | |
| parent | 8310e6196ffeb6d0dce33fc1a528113b04f304d6 (diff) | |
| download | frameworks_base-413f62930003d4ff20e29fd3bbfaf2d163a08ac1.zip frameworks_base-413f62930003d4ff20e29fd3bbfaf2d163a08ac1.tar.gz frameworks_base-413f62930003d4ff20e29fd3bbfaf2d163a08ac1.tar.bz2 | |
Merge "Change GATT_FAILURE from 0 to 0x101" into jb-mr2-dev
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 |