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

Commit f1bd6ae0 authored by Zach Johnson's avatar Zach Johnson
Browse files

Simplify setPasskey 

Bug: 145171640
Test: compile & run
Change-Id: I9d30ac44b0ab41107b9851b233218ff0bad34c74
parent e4441430

android/app/src/com/android/bluetooth/btservice/AdapterService.java

+15 −20
Original line number Diff line number Diff line
@@ -1669,7 +1669,21 @@ public class AdapterService extends Service { 


            enforceBluetoothPermission(service);



            return service.setPasskey(device, accept, len, passkey);

            DeviceProperties deviceProp = service.mRemoteDevices.getDeviceProperties(device);

            if (deviceProp == null || !deviceProp.isBonding()) {

                return false;

            }

            if (passkey.length != len) {

                android.util.EventLog.writeEvent(0x534e4554, "139287605", -1,

                        "Passkey length mismatch");

                return false;

            }

            service.logUserBondResponse(device, accept, BluetoothProtoEnums.BOND_SUB_STATE_LOCAL_SSP_REPLIED);

            return service.sspReplyNative(

                    addressToBytes(device.getAddress()),

                    AbstractionLayer.BT_SSP_VARIANT_PASSKEY_ENTRY,

                    accept,

                    Utils.byteArrayToInt(passkey));

        }



        @Override
@@ -2558,25 +2572,6 @@ public class AdapterService extends Service { 
                accepted ? 0 : BluetoothDevice.UNBOND_REASON_AUTH_REJECTED);

    }



    boolean setPasskey(BluetoothDevice device, boolean accept, int len, byte[] passkey) {

        DeviceProperties deviceProp = mRemoteDevices.getDeviceProperties(device);

        if (deviceProp == null || !deviceProp.isBonding()) {

            return false;

        }



        if (passkey.length != len) {

            android.util.EventLog.writeEvent(0x534e4554, "139287605", -1,

                    "Passkey length mismatch");

            return false;

        }



        logUserBondResponse(device, accept, BluetoothProtoEnums.BOND_SUB_STATE_LOCAL_SSP_REPLIED);



        byte[] addr = Utils.getBytesFromAddress(device.getAddress());

        return sspReplyNative(addr, AbstractionLayer.BT_SSP_VARIANT_PASSKEY_ENTRY, accept,

                Utils.byteArrayToInt(passkey));

    }



    boolean setPairingConfirmation(BluetoothDevice device, boolean accept) {

        DeviceProperties deviceProp = mRemoteDevices.getDeviceProperties(device);

        if (deviceProp == null || !deviceProp.isBonding()) {