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

Commit 2a5ef688 authored by Jakub Pawlowski's avatar Jakub Pawlowski
Browse files

Remove write type from GATT descriptor writes (1/4) 

According to the Bluetooth Core specification v4.2, Vol 3, Part G,
section 4.12.3: "The Attribute Protocol WRITE REQUEST is used
for this sub-procedure".

Change-Id: I141dd24ed5911d5d485b52a1b661835b9960921a
parent 8d7adf28

framework/java/android/bluetooth/BluetoothGatt.java

+1 −3
Original line number Diff line number Diff line
@@ -419,7 +419,6 @@ public final class BluetoothGatt implements BluetoothProfile { 
                    try {

                        mAuthRetry = true;

                        mService.writeDescriptor(mClientIf, address, handle,

                            BluetoothGattCharacteristic.WRITE_TYPE_DEFAULT,

                            AUTHENTICATION_MITM, descriptor.getValue());

                        return;

                    } catch (RemoteException e) {
@@ -942,8 +941,7 @@ public final class BluetoothGatt implements BluetoothProfile { 


        try {

            mService.writeDescriptor(mClientIf, device.getAddress(), descriptor.getInstanceId(),

                BluetoothGattCharacteristic.WRITE_TYPE_DEFAULT, AUTHENTICATION_NONE,

                descriptor.getValue());

                AUTHENTICATION_NONE, descriptor.getValue());

        } catch (RemoteException e) {

            Log.e(TAG,"",e);

            mDeviceBusy = false;

framework/java/android/bluetooth/IBluetoothGatt.aidl

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ interface IBluetoothGatt { 
                            in int writeType, in int authReq, in byte[] value);

    void readDescriptor(in int clientIf, in String address, in int handle, in int authReq);

    void writeDescriptor(in int clientIf, in String address, in int handle,

                            in int writeType, in int authReq, in byte[] value);

                            in int authReq, in byte[] value);

    void registerForNotification(in int clientIf, in String address, in int handle, in boolean enable);

    void beginReliableWrite(in int clientIf, in String address);

    void endReliableWrite(in int clientIf, in String address, in boolean execute);