Merge "Merge sc-v2-dev-plus-aosp-without-vendor@8084891" into stage-aosp-master

2022-02-14 17:30:11 +00:00
parent 1a16975a36 b9e9ca119c
commit da7237b2ed
704 changed files with 54456 additions and 61773 deletions
--- a/src/com/android/settings/bluetooth/BluetoothPairingService.java
+++ b/src/com/android/settings/bluetooth/BluetoothPairingService.java
@@ -188,7 +188,8 @@ public final class BluetoothPairingService extends Service {
        }

        PendingIntent pairIntent = PendingIntent.getService(this, 0, pairingDialogIntent,
-                PendingIntent.FLAG_ONE_SHOT | PendingIntent.FLAG_IMMUTABLE);
+                PendingIntent.FLAG_ONE_SHOT | PendingIntent.FLAG_UPDATE_CURRENT
+                        | PendingIntent.FLAG_IMMUTABLE);

        Intent serviceIntent = new Intent(ACTION_DISMISS_PAIRING);
        serviceIntent.setClass(this, BluetoothPairingService.class);