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

Commit 844b4e98 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Simplify removing a bond" am: 42239d87 am: 9e5edc45 

Change-Id: I1abd5ccd19dc8aeefb307294a557677623c59034
parents fc402f6f 9e5edc45

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

+10 −14
Original line number Diff line number Diff line
@@ -1440,7 +1440,16 @@ public class AdapterService extends 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
@@ -2074,19 +2083,6 @@ public class AdapterService extends Service { 
        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}

     *