diff --git a/src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java b/src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java index 650267a4757..8dd00b389ed 100644 --- a/src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java +++ b/src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java @@ -86,8 +86,12 @@ public class BluetoothPairingDialogFragment extends InstrumentedDialogFragment i @Override public void onDestroy() { super.onDestroy(); - if (!mPositiveClicked) { - mPairingController.onCancel(); + if (mPairingController.getDialogType() + != BluetoothPairingController.DISPLAY_PASSKEY_DIALOG) { + /* Cancel pairing unless explicitly accepted by user */ + if (!mPositiveClicked) { + mPairingController.onCancel(); + } } }