diff options
| author | Matthew Xie <mattx@google.com> | 2013-05-28 13:50:09 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-28 13:50:09 -0700 |
| commit | 5dcc1b2d50dba683be0f540f27a7ec6c19080c58 (patch) | |
| tree | 32e9e32d7a3e6701ee00cff2681cd444ad0514ab /framework/java | |
| parent | d76941244afaa59447ef44260a755f25f865c21a (diff) | |
| parent | 5003bb10fd6bd1b0006cfae89cb4a25721896f25 (diff) | |
am 5003bb10: am 413f6293: Merge "Change GATT_FAILURE from 0 to 0x101" into jb-mr2-dev
* commit '5003bb10fd6bd1b0006cfae89cb4a25721896f25':
Change GATT_FAILURE from 0 to 0x101
Diffstat (limited to 'framework/java')
| -rw-r--r-- | framework/java/android/bluetooth/BluetoothGatt.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/framework/java/android/bluetooth/BluetoothGatt.java b/framework/java/android/bluetooth/BluetoothGatt.java index 4df6e7cfd4..77e5f8471a 100644 --- a/framework/java/android/bluetooth/BluetoothGatt.java +++ b/framework/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 |