commit b0a9ebae0a02dfe9d876d442718f675efd7af06b
author Himanshu Rawat <rwt@google.com> Fri Jul 29 00:27:41 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jul 29 00:27:41 2022 +0000
tree 9817141ff69437fa7e9e4433b8d04196a1c1afdd
parent 5d68dd58aa6bed78cddd02d108f9cfb6f9325e94
parent dc7aa0e87f145281613849357441fcd007ef6e5a

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

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

diff --git a/src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java b/src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java
index 650267a..8dd00b3 100644
--- a/src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java
+++ b/src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java
@@ -86,8 +86,12 @@
     @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();
+            }
         }
     }