diff options
| author | Matthew Xie <mattx@google.com> | 2013-05-26 14:40:14 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-26 14:40:14 -0700 |
| commit | e7e6bf9f02a0a74f0a8d3812d2a3a3f3ec855086 (patch) | |
| tree | f0ea6e1ad495f33852491e555c192eb4192655ca /api | |
| parent | 84e1afcccc328e7a52bfde16e824a3ed37889d1d (diff) | |
| parent | 27e453617a2c179580a55d6cbe0619fa95adf693 (diff) | |
| download | frameworks_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 'api')
| -rw-r--r-- | api/current.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt index 98081f7..2078dae 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 |