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

Commit 419b7fa2 authored by Qasim Javed's avatar Qasim Javed
Browse files

Only cancel bonding if pair button is not pressed 

aosp/2093046 cancels bonding unconditionally in onDestroy(), this
results in the user not being able to pair when the pair button is
pressed because onDestroy() is also called in that case.

Only cancel bonding if the user did not press the pair button.

Bug: 231554812
Test: Changed settings app is able to scan after dismissing the dialog
and is also able to pair when the pair button is pressed

Change-Id: I868af9b795f1bb0766656e4619bd06dc8028008a
parent 05218566

src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java

+5 −1
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ public class BluetoothPairingDialogFragment extends InstrumentedDialogFragment i 
    private BluetoothPairingController mPairingController;

    private BluetoothPairingDialog mPairingDialogActivity;

    private EditText mPairingView;

    private boolean mPositiveClicked = false;

    /**

     * The interface we expect a listener to implement. Typically this should be done by

     * the controller.
@@ -85,8 +86,10 @@ public class BluetoothPairingDialogFragment extends InstrumentedDialogFragment i 
    @Override

    public void onDestroy() {

        super.onDestroy();

        if (!mPositiveClicked) {

            mPairingController.onCancel();

        }

    }



    @Override

    public void beforeTextChanged(CharSequence s, int start, int count, int after) {
@@ -110,6 +113,7 @@ public class BluetoothPairingDialogFragment extends InstrumentedDialogFragment i 
    @Override

    public void onClick(DialogInterface dialog, int which) {

        if (which == DialogInterface.BUTTON_POSITIVE) {

            mPositiveClicked = true;

            mPairingController.onDialogPositiveClick(this);

        } else if (which == DialogInterface.BUTTON_NEGATIVE) {

            mPairingController.onDialogNegativeClick(this);