summaryrefslogtreecommitdiffstats
path: root/core/java/android/bluetooth/BluetoothGatt.java
diff options
context:
space:
mode:
authorMatthew Xie <mattx@google.com>2013-05-28 22:30:10 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-05-28 22:30:10 -0700
commit16a90db8d740b95cd4bdeff631464f58c9ed3da6 (patch)
tree42496c3ec4575270cbd0259678d9bed6cf5a3249 /core/java/android/bluetooth/BluetoothGatt.java
parent7ca6c5c42644d1036ca505db96c4986e2da70c62 (diff)
parent897d98a7530109bff8d73b3651d8884c76f54c42 (diff)
downloadframeworks_base-16a90db8d740b95cd4bdeff631464f58c9ed3da6.zip
frameworks_base-16a90db8d740b95cd4bdeff631464f58c9ed3da6.tar.gz
frameworks_base-16a90db8d740b95cd4bdeff631464f58c9ed3da6.tar.bz2
am 897d98a7: am 6ea0636a: Merge "Revert "Revert "Change GATT_FAILURE from 0 to 0x101""" into jb-mr2-dev
* commit '897d98a7530109bff8d73b3651d8884c76f54c42': Revert "Revert "Change GATT_FAILURE from 0 to 0x101""
Diffstat (limited to 'core/java/android/bluetooth/BluetoothGatt.java')
-rw-r--r--core/java/android/bluetooth/BluetoothGatt.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/bluetooth/BluetoothGatt.java b/core/java/android/bluetooth/BluetoothGatt.java
index 4df6e7c..77e5f84 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