Merge "Don't cancel passkey entry pairing autonomously"

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) {
+        if (mPairingController.getDialogType()
-            mPairingController.onCancel();
+                != BluetoothPairingController.DISPLAY_PASSKEY_DIALOG) {
+            /* Cancel pairing unless explicitly accepted by user */
+            if (!mPositiveClicked) {
+                mPairingController.onCancel();
+            }
         }
     }