drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Revert "Change GATT_FAILURE from 0 to 0x101""" into jb-mr2-dev

Browse Source
This commit is contained in:
Matthew Xie
2013-05-29 05:25:47 +00:00
committed by Android (Google) Code Review
parent 295eddb92f 90ca807f7b
commit 6ea0636a9c
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@ -4923,7 +4923,7 @@ package android.bluetooth {
method public boolean setCharacteristicNotification(android.bluetooth.BluetoothGattCharacteristic, boolean); method public boolean setCharacteristicNotification(android.bluetooth.BluetoothGattCharacteristic, boolean);
method public boolean writeCharacteristic(android.bluetooth.BluetoothGattCharacteristic); method public boolean writeCharacteristic(android.bluetooth.BluetoothGattCharacteristic);
method public boolean writeDescriptor(android.bluetooth.BluetoothGattDescriptor); method public boolean writeDescriptor(android.bluetooth.BluetoothGattDescriptor);
field public static final int GATT_FAILURE = 0; // 0x0 field public static final int GATT_FAILURE = 257; // 0x101
field public static final int GATT_INSUFFICIENT_AUTHENTICATION = 5; // 0x5 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_INSUFFICIENT_ENCRYPTION = 15; // 0xf
field public static final int GATT_INVALID_ATTRIBUTE_LENGTH = 13; // 0xd field public static final int GATT_INVALID_ATTRIBUTE_LENGTH = 13; // 0xd

6
core/java/android/bluetooth/BluetoothGatt.java
View File

@ -70,9 +70,6 @@ public final class BluetoothGatt implements BluetoothProfile {
private List<BluetoothGattService> mServices; private List<BluetoothGattService> mServices;
/** A GATT operation failed */
public static final int GATT_FAILURE = 0;
/** A GATT operation completed successfully */ /** A GATT operation completed successfully */
public static final int GATT_SUCCESS = 0; 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 */ /** A write operation exceeds the maximum length of the attribute */
public static final int GATT_INVALID_ATTRIBUTE_LENGTH = 0xd; 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. * No authentication required.
* @hide * @hide