Merge "Settings: [BT] Wrong Pairing Popup is shown on new pairing request." into qt-dev

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

@@ -124,7 +124,8 @@ public final class BluetoothPairingService extends Service {
                 .setLocalOnly(true);
 
         PendingIntent pairIntent = PendingIntent.getActivity(this, 0,
-                getPairingDialogIntent(this, intent), PendingIntent.FLAG_ONE_SHOT);
+                getPairingDialogIntent(this, intent),
+                PendingIntent.FLAG_ONE_SHOT | PendingIntent.FLAG_UPDATE_CURRENT);
 
         PendingIntent dismissIntent = PendingIntent.getBroadcast(this, 0,
                 new Intent(ACTION_DISMISS_PAIRING), PendingIntent.FLAG_ONE_SHOT);