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

Commit cd4df5a1 authored by tim peng's avatar tim peng Committed by Automerger Merge Worker
Browse files

Merge "Add the explicitly mutable flag for creating a PendingIntent in... 

Merge "Add the explicitly mutable flag for creating a PendingIntent in MediaOutputSlice" into rvc-qpr-dev am: d0822216

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia9a1679a3b154e0aba27a01d1ad42f407e3d58a4
parents 1cb02f5e d0822216

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

+7 −4
Original line number Diff line number Diff line
@@ -147,7 +147,8 @@ public class MediaOutputSlice implements CustomSliceable { 
                .setSourceMetricsCategory(SettingsEnums.PANEL_MEDIA_OUTPUT)

                .toIntent();

        final SliceAction primarySliceAction = SliceAction.createDeeplink(

                PendingIntent.getActivity(mContext, 0 /* requestCode */, intent, 0 /* flags */),

                PendingIntent.getActivity(mContext, 0 /* requestCode */, intent,

                        PendingIntent.FLAG_IMMUTABLE),

                IconCompat.createWithResource(mContext, R.drawable.ic_add_24dp/*ic_add_blue_24dp*/),

                ListBuilder.ICON_IMAGE,

                mContext.getText(R.string.bluetooth_pairing_pref_title));
@@ -248,7 +249,8 @@ public class MediaOutputSlice implements CustomSliceable { 
                .putExtra(MEDIA_DEVICE_ID, id)

                .setClass(mContext, SliceBroadcastReceiver.class);



        return PendingIntent.getBroadcast(mContext, requestCode, intent, 0);

        return PendingIntent.getBroadcast(mContext, requestCode, intent,

                PendingIntent.FLAG_IMMUTABLE);

    }



    private SliceAction getEndItemSliceAction() {
@@ -261,7 +263,8 @@ public class MediaOutputSlice implements CustomSliceable { 
                ? 0

                : getWorker().getPackageName().hashCode();

        return SliceAction.createDeeplink(

                PendingIntent.getActivity(mContext, requestCode, intent, 0 /* flags */),

                PendingIntent.getActivity(mContext, requestCode, intent,

                        PendingIntent.FLAG_IMMUTABLE),

                IconCompat.createWithResource(mContext, R.drawable.ic_add_blue_24dp),

                ListBuilder.ICON_IMAGE,

                mContext.getText(R.string.add));
@@ -350,7 +353,7 @@ public class MediaOutputSlice implements CustomSliceable { 
        intent.putExtra(MEDIA_DEVICE_ID, id);

        intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);

        return PendingIntent.getBroadcast(context, requestCode, intent,

                PendingIntent.FLAG_UPDATE_CURRENT);

                PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);

    }



    @Override