Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d9312ce4 authored by Tim Peng's avatar Tim Peng Committed by Automerger Merge Worker
Browse files

Add the explicitly mutable flag for creating a PendingIntent am: fbd36bc6 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I378d49a95c30cdc330f0f05e89921a968cc86302
parents ac636e96 fbd36bc6

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

+4 −2
Original line number Diff line number Diff line
@@ -177,7 +177,8 @@ public class RemoteMediaSlice implements CustomSliceable { 
                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 @@ public class RemoteMediaSlice implements CustomSliceable { 
                .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),