summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2021-04-19 10:40:25 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2021-04-19 10:40:25 +0000
commit29f7ff1aa62f515b2d86fdbb85cefa178e8a2e1b (patch)
tree10f697b0efa8121ec466eaafe41779bd8dfce06a
parenteebade3ca5653bdf42ceb6a5840222a153847233 (diff)
parent287c90d4b0bba045fdfad21ce7fe5e284346bbaa (diff)
Merge "Replace unaudited PendingIntents with FLAG_IMMUTABLE" into sc-dev
-rw-r--r--services/core/java/com/android/server/wm/ActivityTaskManagerService.java4
1 files changed, 1 insertions, 3 deletions
diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
index a0beee4afcb9..b83945e950b6 100644
--- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
+++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
@@ -4514,11 +4514,9 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
.setContentTitle(text)
.setContentText(
mContext.getText(R.string.heavy_weight_notification_detail))
- // TODO(b/175194709) Please replace FLAG_MUTABLE_UNAUDITED below
- // with either FLAG_IMMUTABLE (recommended) or FLAG_MUTABLE.
.setContentIntent(PendingIntent.getActivityAsUser(mContext, 0,
intent, PendingIntent.FLAG_CANCEL_CURRENT
- | PendingIntent.FLAG_MUTABLE_UNAUDITED, null,
+ | PendingIntent.FLAG_IMMUTABLE, null,
new UserHandle(userId)))
.build();
try {