summaryrefslogtreecommitdiffstats
path: root/core/java/android/bluetooth/BluetoothGatt.java
diff options
context:
space:
mode:
authorMatthew Xie <mattx@google.com>2013-05-26 14:40:14 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-05-26 14:40:14 -0700
commite7e6bf9f02a0a74f0a8d3812d2a3a3f3ec855086 (patch)
treef0ea6e1ad495f33852491e555c192eb4192655ca /core/java/android/bluetooth/BluetoothGatt.java
parent84e1afcccc328e7a52bfde16e824a3ed37889d1d (diff)
parent27e453617a2c179580a55d6cbe0619fa95adf693 (diff)
downloadframeworks_base-e7e6bf9f02a0a74f0a8d3812d2a3a3f3ec855086.zip
frameworks_base-e7e6bf9f02a0a74f0a8d3812d2a3a3f3ec855086.tar.gz
frameworks_base-e7e6bf9f02a0a74f0a8d3812d2a3a3f3ec855086.tar.bz2
am 27e45361: Merge "Revert "Change GATT_FAILURE from 0 to 0x101"" into jb-mr2-dev
* commit '27e453617a2c179580a55d6cbe0619fa95adf693': 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 f303206..bffe64b 100644
--- a/core/java/android/bluetooth/BluetoothGatt.java
+++ b/core/java/android/bluetooth/BluetoothGatt.java
@@ -70,6 +70,9 @@ 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;
@@ -94,9 +97,6 @@ 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