Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 897d98a7 authored by Matthew Xie's avatar Matthew Xie Committed by Android Git Automerger
Browse files

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

* commit '6ea0636a':
  Revert "Revert "Change GATT_FAILURE from 0 to 0x101""
parents a1f49d8b 6ea0636a

api/current.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -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

core/java/android/bluetooth/BluetoothGatt.java

+3 −3
Original line number Original line Diff line number Diff line
@@ -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