am 897d98a7: am 6ea0636a: Merge "Revert "Revert "Change GATT_FAILURE from 0 to 0x101""" into jb-mr2-dev

* commit '897d98a7530109bff8d73b3651d8884c76f54c42':
  Revert "Revert "Change GATT_FAILURE from 0 to 0x101""
This commit is contained in:
Matthew Xie
2013-05-28 22:30:10 -07:00
committed by Android Git Automerger
2 changed files with 4 additions and 4 deletions

View File

@ -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 = 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_ENCRYPTION = 15; // 0xf
field public static final int GATT_INVALID_ATTRIBUTE_LENGTH = 13; // 0xd