diff options
| author | Matthew Xie <mattx@google.com> | 2013-05-28 13:50:13 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-28 13:50:13 -0700 |
| commit | 67cc127186eba0c1006e75807bb3daaf438c0374 (patch) | |
| tree | d0ba2f562493ff2c5331576ae7d55fc91b72e279 | |
| parent | d78afea78dfaf2063ee38e3dce19a41189cefd55 (diff) | |
| parent | e7e6bf9f02a0a74f0a8d3812d2a3a3f3ec855086 (diff) | |
| download | frameworks_base-67cc127186eba0c1006e75807bb3daaf438c0374.zip frameworks_base-67cc127186eba0c1006e75807bb3daaf438c0374.tar.gz frameworks_base-67cc127186eba0c1006e75807bb3daaf438c0374.tar.bz2 | |
am e7e6bf9f: am 27e45361: Merge "Revert "Change GATT_FAILURE from 0 to 0x101"" into jb-mr2-dev
* commit 'e7e6bf9f02a0a74f0a8d3812d2a3a3f3ec855086':
Revert "Change GATT_FAILURE from 0 to 0x101"
| -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 d8803ad..96a8481 100644 --- a/api/current.txt +++ b/api/current.txt @@ -4930,7 +4930,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 77e5f84..4df6e7c 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 |