diff options
| author | Matthew Xie <mattx@google.com> | 2013-05-26 21:38:01 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-05-26 21:38:01 +0000 |
| commit | 27e453617a2c179580a55d6cbe0619fa95adf693 (patch) | |
| tree | 14d450df3eaaa619e20da6ae0d05272819f2c403 | |
| parent | 413f62930003d4ff20e29fd3bbfaf2d163a08ac1 (diff) | |
| parent | d21f674c150aa26c8094d1418108649f53f810e6 (diff) | |
| download | frameworks_base-27e453617a2c179580a55d6cbe0619fa95adf693.zip frameworks_base-27e453617a2c179580a55d6cbe0619fa95adf693.tar.gz frameworks_base-27e453617a2c179580a55d6cbe0619fa95adf693.tar.bz2 | |
Merge "Revert "Change GATT_FAILURE from 0 to 0x101"" into jb-mr2-dev
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/bluetooth/BluetoothGatt.java | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/api/current.txt b/api/current.txt index e5fd378..a9d0f57 100644 --- a/api/current.txt +++ b/api/current.txt @@ -4923,7 +4923,7 @@ package android.bluetooth { method public boolean setCharacteristicNotification(android.bluetooth.BluetoothGattCharacteristic, boolean); method public boolean writeCharacteristic(android.bluetooth.BluetoothGattCharacteristic); method public boolean writeDescriptor(android.bluetooth.BluetoothGattDescriptor); - field public static final int GATT_FAILURE = 257; // 0x101 + field public static final int GATT_FAILURE = 0; // 0x0 field public static final int GATT_INSUFFICIENT_AUTHENTICATION = 5; // 0x5 field public static final int GATT_INSUFFICIENT_ENCRYPTION = 15; // 0xf field public static final int GATT_INVALID_ATTRIBUTE_LENGTH = 13; // 0xd 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 |