summaryrefslogtreecommitdiffstats
path: root/core/java/android/bluetooth/BluetoothGatt.java
diff options
context:
space:
mode:
authorMatthew Xie <mattx@google.com>2013-05-28 13:50:09 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-05-28 13:50:09 -0700
commitd78afea78dfaf2063ee38e3dce19a41189cefd55 (patch)
treee2c979d0b9a3e545c645930d3d0340128fdb47a8 /core/java/android/bluetooth/BluetoothGatt.java
parent525862c776bab397c13ab8b0c58b77819e34a30b (diff)
parent84e1afcccc328e7a52bfde16e824a3ed37889d1d (diff)
downloadframeworks_base-d78afea78dfaf2063ee38e3dce19a41189cefd55.zip
frameworks_base-d78afea78dfaf2063ee38e3dce19a41189cefd55.tar.gz
frameworks_base-d78afea78dfaf2063ee38e3dce19a41189cefd55.tar.bz2
am 84e1afcc: am 413f6293: Merge "Change GATT_FAILURE from 0 to 0x101" into jb-mr2-dev
* commit '84e1afcccc328e7a52bfde16e824a3ed37889d1d': 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