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

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

Simplify setPairingResponse 

Bug: 145171640
Test: compile & run
Change-Id: I4554719ddcd9f14bda586057e8de023e478f6d38
parent f1bd6ae0

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

+10 −14
Original line number Diff line number Diff line
@@ -1695,7 +1695,16 @@ public class AdapterService extends Service { 


            enforceBluetoothPrivilegedPermission(service);



            return service.setPairingConfirmation(device, accept);

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

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

                return false;

            }

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

            return service.sspReplyNative(

                    addressToBytes(device.getAddress()),

                    AbstractionLayer.BT_SSP_VARIANT_PASSKEY_CONFIRMATION,

                    accept,

                    0);

        }



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

    }



    boolean setPairingConfirmation(BluetoothDevice device, boolean accept) {

        DeviceProperties deviceProp = mRemoteDevices.getDeviceProperties(device);

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

            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_CONFIRMATION, accept,

                0);

    }



    int getPhonebookAccessPermission(BluetoothDevice device) {

        SharedPreferences pref = getSharedPreferences(PHONEBOOK_ACCESS_PERMISSION_PREFERENCE_FILE,

                Context.MODE_PRIVATE);