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

Commit c32df422 authored by Jakub Pawlowski's avatar Jakub Pawlowski Committed by android-build-merger
Browse files

Merge "Remove write type from GATT descriptor writes (1/4)" am: 44a40ed8 am:... 

Merge "Remove write type from GATT descriptor writes (1/4)" am: 44a40ed8 am: 2e20eb8c am: ed042c00e0
am: a3c41d3f

Change-Id: I418e61d8d60d53980c43c15a2d01ce32005c5eb3
parents bf56ced4 a3c41d3f

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
@@ -57,7 +57,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);