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),
