From 287c90d4b0bba045fdfad21ce7fe5e284346bbaa Mon Sep 17 00:00:00 2001
From: Chilun <chilunhuang@google.com>
Date: Thu, 15 Apr 2021 16:36:55 +0800
Subject: [PATCH] Replace unaudited PendingIntents with FLAG_IMMUTABLE

Bug: 181012686
Bug: 175194709
Test: atest ActivityTaskManagerServiceTests

Change-Id: I96fe9207b7fb3968a36fe9f902a78ab28d65fc93
---
 .../com/android/server/wm/ActivityTaskManagerService.java     | 4 +---
 1 file changed, 1 insertion(+), 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 c8fa50c35baa0..69dff5604b47b 100644
--- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
+++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
@@ -4655,11 +4655,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 {