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

Commit 23580439 authored by Andre Eisenbach's avatar Andre Eisenbach Committed by Gerrit Code Review
Browse files

Merge "Always use Write Request for GATT descriptor writes"

parents 7bf9e198 942aebc9

core/java/android/bluetooth/BluetoothGatt.java

+3 −2
Original line number Diff line number Diff line
@@ -422,7 +422,7 @@ public final class BluetoothGatt implements BluetoothProfile { 
                    try {

                        mAuthRetry = true;

                        mService.writeDescriptor(mClientIf, address, handle,

                            descriptor.getCharacteristic().getWriteType(),

                            BluetoothGattCharacteristic.WRITE_TYPE_DEFAULT,

                            AUTHENTICATION_MITM, descriptor.getValue());

                        return;

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


        try {

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

                characteristic.getWriteType(), AUTHENTICATION_NONE, descriptor.getValue());

                BluetoothGattCharacteristic.WRITE_TYPE_DEFAULT, AUTHENTICATION_NONE,

                descriptor.getValue());

        } catch (RemoteException e) {

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

            mDeviceBusy = false;