Merge "Don't cancel passkey entry pairing autonomously"

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

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