summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorMatthew Xie <mattx@google.com>2013-05-29 05:25:47 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-05-29 05:25:47 +0000
commit6ea0636a9c6e3661d6a9ac443eba5b9b6a0d7354 (patch)
tree9f0780c1603c2df13a79136451ce38ab7b18265a /core/java
parent295eddb92fd6e137ae352ea8dace2ecd18bf0a8a (diff)
parent90ca807f7b2037499112d1c49c4b0793cc780540 (diff)
downloadframeworks_base-6ea0636a9c6e3661d6a9ac443eba5b9b6a0d7354.zip
frameworks_base-6ea0636a9c6e3661d6a9ac443eba5b9b6a0d7354.tar.gz
frameworks_base-6ea0636a9c6e3661d6a9ac443eba5b9b6a0d7354.tar.bz2
Merge "Revert "Revert "Change GATT_FAILURE from 0 to 0x101""" into jb-mr2-dev
Diffstat (limited to 'core/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 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