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

Commit ab855cda authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

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

Merge "Merge "Remove write type from GATT descriptor writes (1/4)" am: b7eb1d7e am: 0aa57979 am: ed042c00 am: 9dd9e1a6"
parents 1b5eb1e3 d92a9bbf

core/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;

core/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);