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

Commit 884a10c8 authored by Himanshu Rawat's avatar Himanshu Rawat Committed by Automerger Merge Worker
Browse files

Merge "Don't cancel passkey entry pairing autonomously" am: 059ab284 am:... 

Merge "Don't cancel passkey entry pairing autonomously" am: 059ab284 am: 7c6a0044 am: 99bbb571 am: 8fc819f8 am: e379ccff

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2159779



Change-Id: Iee681eb028dd51fd744c2fb4f0ac3306fea2e1fd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 69a431d1 e379ccff

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) {