commit aa9620f841f4dedc220e8d159509dbeaad94f48d
author Betty Chang <changbetty@google.com> Sat Jan 07 08:39:31 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Jan 07 08:39:31 2023 +0000
tree 9ebc57fc7bb318dadd6c44f08f6451590f4ee7ca
parent a65999cc60b9bb661ac18e35f304a4f231953cd7
parent 9cb6a08d16059e1393988703e5792c03218008f0

Merge "Change the intent flag to immutable" into tm-qpr-dev am: cfc1569f12 am: 9cb6a08d16

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20802849

Change-Id: If1b0f3a85a5eb96336cba7836bcb06be65a83028
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

src/com/android/settings/notification/MediaVolumePreferenceController.java

diff --git a/src/com/android/settings/notification/MediaVolumePreferenceController.java b/src/com/android/settings/notification/MediaVolumePreferenceController.java
index 8c5cf21..e40a2b4 100644
--- a/src/com/android/settings/notification/MediaVolumePreferenceController.java
+++ b/src/com/android/settings/notification/MediaVolumePreferenceController.java
@@ -125,7 +125,7 @@
                     getWorker().getActiveLocalMediaController().getPackageName());
 
             pi = PendingIntent.getBroadcast(context, 0 /* requestCode */, intent,
-                    PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_MUTABLE);
+                    PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
         } else {
             final CachedBluetoothDevice bluetoothDevice =
                     ((BluetoothMediaDevice) mMediaDevice).getCachedDevice();
@@ -142,7 +142,7 @@
                     && getWorker().getActiveLocalMediaController() != null);
 
             pi = PendingIntent.getActivity(context, 0 /* requestCode */, intent,
-                    PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_MUTABLE);
+                    PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
         }
 
         final IconCompat icon = getBroadcastIcon(context);