commit fbe124ac1dadc3d1919532cd81e60c0fd3fb12b4
author TreeHugger Robot <treehugger-gerrit@google.com> Sat Dec 19 16:30:13 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Dec 19 16:30:13 2020 +0000
tree c09f38fda07889541efc11c4e36ca0d02ab5265c
parent fbd36bc62ba3c8dc5d3810672e731ecec161dd51
parent 86fcddb29b6994b2b03b69bd6c141ca99950562e

Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev

src/com/android/settings/media/RemoteMediaSlice.java

diff --git a/src/com/android/settings/media/RemoteMediaSlice.java b/src/com/android/settings/media/RemoteMediaSlice.java
index 5e50b55..09eb32e 100644
--- a/src/com/android/settings/media/RemoteMediaSlice.java
+++ b/src/com/android/settings/media/RemoteMediaSlice.java
@@ -177,7 +177,8 @@
                 mContext.getText(R.string.sound_settings).toString(), 0);
         intent.setClassName(mContext.getPackageName(), SubSettings.class.getName());
         intent.setData(contentUri);
-        final PendingIntent pendingIntent = PendingIntent.getActivity(mContext, 0, intent, 0);
+        final PendingIntent pendingIntent = PendingIntent.getActivity(mContext, 0, intent,
+                PendingIntent.FLAG_IMMUTABLE);
         final SliceAction primarySliceAction = SliceAction.createDeeplink(pendingIntent, icon,
                 ListBuilder.ICON_IMAGE, actionTitle);
         return primarySliceAction;
@@ -192,7 +193,8 @@
                 .putExtra(SESSION_INFO, info)
                 .addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
         final PendingIntent primaryBroadcastIntent = PendingIntent.getBroadcast(mContext,
-                info.hashCode(), intent, PendingIntent.FLAG_UPDATE_CURRENT);
+                info.hashCode(), intent,
+                PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
         final SliceAction primarySliceAction = SliceAction.createDeeplink(
                 primaryBroadcastIntent,
                 IconCompat.createWithResource(mContext, R.drawable.ic_volume_remote),