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

Commit bfcfb7ee authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 22302 into eclair 

* changes:
  Set BondState to Canceled when user cancels pairing.
parents c813129f 397d8f4f

core/java/android/server/BluetoothService.java

+2 −0
Original line number Diff line number Diff line
@@ -1006,6 +1006,8 @@ public class BluetoothService extends IBluetooth.Stub { 
        if (!BluetoothDevice.checkBluetoothAddress(address)) {

            return false;

        }

        mBondState.setBondState(address, BluetoothDevice.BOND_NOT_BONDED,

                BluetoothDevice.UNBOND_REASON_AUTH_CANCELED);

        address = address.toUpperCase();

        Integer data = mEventLoop.getPasskeyAgentRequestData().remove(address);

        if (data == null) {