Snap for 8887382 from b0a9ebae0a to tm-qpr1-release

Change-Id: I104fadaaddcd1d98f99aa5b6d196a241c190cf15
2022-07-30 01:25:27 +00:00
parent 04d64054c9 b0a9ebae0a
commit 66fc0c7a32
1 changed files with 6 additions and 2 deletions
--- 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();
+            }
        }
    }