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

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

Simplify removing a bond 

Bug: 145171640
Test: compile, run and try to remove a bond
Change-Id: Ic89765420d5e52ed5462495cc4bad17a24c13291
parent b9c4f48f

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

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




            enforceBluetoothAdminPermission(service);

            enforceBluetoothAdminPermission(service);





            return service.removeBond(device);

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

            if (deviceProp == null || deviceProp.getBondState() != BluetoothDevice.BOND_BONDED) {

                return false;

            }

            deviceProp.setBondingInitiatedLocally(false);



            Message msg = service.mBondStateMachine.obtainMessage(BondStateMachine.REMOVE_BOND);

            msg.obj = device;

            service.mBondStateMachine.sendMessage(msg);

            return true;

        }

        }





        @Override

        @Override
@@ -2074,19 +2083,6 @@ public class AdapterService extends Service { 
        mBondStateMachine.sendMessage(msg);

        mBondStateMachine.sendMessage(msg);

    }

    }





    boolean removeBond(BluetoothDevice device) {

        DeviceProperties deviceProp = mRemoteDevices.getDeviceProperties(device);

        if (deviceProp == null || deviceProp.getBondState() != BluetoothDevice.BOND_BONDED) {

            return false;

        }

        deviceProp.setBondingInitiatedLocally(false);



        Message msg = mBondStateMachine.obtainMessage(BondStateMachine.REMOVE_BOND);

        msg.obj = device;

        mBondStateMachine.sendMessage(msg);

        return true;

    }



    /**

    /**

     * Get the bond state of a particular {@link BluetoothDevice}

     * Get the bond state of a particular {@link BluetoothDevice}

     *

     *