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

Commit 221c09d8 authored by Himanshu Rawat's avatar Himanshu Rawat Committed by Android (Google) Code Review
Browse files

Merge "Don't cancel passkey entry pairing autonomously" into tm-d1-dev

parents 4a547374 c2b402bd

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

+6 −2
Original line number Diff line number Diff line
@@ -86,10 +86,14 @@ public class BluetoothPairingDialogFragment extends InstrumentedDialogFragment i 
    @Override

    public void onDestroy() {

        super.onDestroy();

        if (mPairingController.getDialogType()

                != BluetoothPairingController.DISPLAY_PASSKEY_DIALOG) {

            /* Cancel pairing unless explicitly accepted by user */

            if (!mPositiveClicked) {

                mPairingController.onCancel();

            }

        }

    }



    @Override

    public void beforeTextChanged(CharSequence s, int start, int count, int after) {