Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c5133812 authored by Lei Yu's avatar Lei Yu Committed by android-build-merger
Browse files

Merge "Settings: [BT] Wrong Pairing Popup is shown on new pairing request." am: 11ce6445 

am: 544f6090

Change-Id: I105d8d47b22b777eee5b549f7c29b1e252895f39
parents 3a4412ff 544f6090

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

+2 −1
Original line number Diff line number Diff line
@@ -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);