Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add immutability flag to PendingIntents" into rvc-qpr-dev-plus-aosp

Browse Source
This commit is contained in:
Gavin Corkery
2021-03-05 10:41:30 +00:00
committed by Android (Google) Code Review
parent f3fb6b3099 281d150245
commit 8699e31071
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/Shell/src/com/android/shell/BugreportProgressService.java
View File

@@ -803,7 +803,7 @@ public class BugreportProgressService extends Service {
intent.setClass(context, BugreportProgressService.class); intent.setClass(context, BugreportProgressService.class);
intent.putExtra(EXTRA_ID, info.id); intent.putExtra(EXTRA_ID, info.id);
return PendingIntent.getService(context, info.id, intent, return PendingIntent.getService(context, info.id, intent,
PendingIntent.FLAG_UPDATE_CURRENT); PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
} }
/** /**
@@ -1263,7 +1263,7 @@ public class BugreportProgressService extends Service {
.setTicker(title) .setTicker(title)
.setContentText(content) .setContentText(content)
.setContentIntent(PendingIntent.getService(mContext, info.id, shareIntent, .setContentIntent(PendingIntent.getService(mContext, info.id, shareIntent,
PendingIntent.FLAG_UPDATE_CURRENT)) PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE))
.setOnlyAlertOnce(false) .setOnlyAlertOnce(false)
.setDeleteIntent(newCancelIntent(mContext, info)); .setDeleteIntent(newCancelIntent(mContext, info));