PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 11ce64450c

Change-Id: I1bf0ed7400e556f8f8f6ad3e7a4b58b383a67034
This commit is contained in:
Lei Yu
2019-04-05 11:09:52 -07:00
committed by android-build-merger
parent 7d59c48038 11ce64450c
commit 544f60909b
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/bluetooth/BluetoothPairingService.java
View File

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