PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia9a1679a3b154e0aba27a01d1ad42f407e3d58a4
This commit is contained in:
tim peng
2021-03-05 04:25:29 +00:00
committed by Automerger Merge Worker
parent 1cb02f5e0d d082221652
commit cd4df5a1d3
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/media/MediaOutputSlice.java
View File

@@ -147,7 +147,8 @@ public class MediaOutputSlice implements CustomSliceable {
.setSourceMetricsCategory(SettingsEnums.PANEL_MEDIA_OUTPUT) .setSourceMetricsCategory(SettingsEnums.PANEL_MEDIA_OUTPUT)
.toIntent(); .toIntent();
final SliceAction primarySliceAction = SliceAction.createDeeplink( 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*/), IconCompat.createWithResource(mContext, R.drawable.ic_add_24dp/*ic_add_blue_24dp*/),
ListBuilder.ICON_IMAGE, ListBuilder.ICON_IMAGE,
mContext.getText(R.string.bluetooth_pairing_pref_title)); mContext.getText(R.string.bluetooth_pairing_pref_title));
@@ -248,7 +249,8 @@ public class MediaOutputSlice implements CustomSliceable {
.putExtra(MEDIA_DEVICE_ID, id) .putExtra(MEDIA_DEVICE_ID, id)
.setClass(mContext, SliceBroadcastReceiver.class); .setClass(mContext, SliceBroadcastReceiver.class);
return PendingIntent.getBroadcast(mContext, requestCode, intent, 0); return PendingIntent.getBroadcast(mContext, requestCode, intent,
PendingIntent.FLAG_IMMUTABLE);
} }
private SliceAction getEndItemSliceAction() { private SliceAction getEndItemSliceAction() {
@@ -261,7 +263,8 @@ public class MediaOutputSlice implements CustomSliceable {
? 0 ? 0
: getWorker().getPackageName().hashCode(); : getWorker().getPackageName().hashCode();
return SliceAction.createDeeplink( 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), IconCompat.createWithResource(mContext, R.drawable.ic_add_blue_24dp),
ListBuilder.ICON_IMAGE, ListBuilder.ICON_IMAGE,
mContext.getText(R.string.add)); mContext.getText(R.string.add));
@@ -350,7 +353,7 @@ public class MediaOutputSlice implements CustomSliceable {
intent.putExtra(MEDIA_DEVICE_ID, id); intent.putExtra(MEDIA_DEVICE_ID, id);
intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND); intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
return PendingIntent.getBroadcast(context, requestCode, intent, return PendingIntent.getBroadcast(context, requestCode, intent,
PendingIntent.FLAG_UPDATE_CURRENT); PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
} }
@Override @Override