commit 2cd616165c6de4d523637cd84eb0c7490415beb6
author Dmitry Dementyev <dementyev@google.com> Wed Dec 09 16:21:32 2020 -0800
committer Dmitry Dementyev <dementyev@google.com> Tue Jan 26 20:58:05 2021 +0000
tree 5ace6da1e2d534bd92a507072272f84406461c46
parent de3b7f1aea3cd8267b9b007f43a4a8276059deb2

Add IMMUTABLE flag to AccountManager pending intents.

Bug: 174189215,177931355
Test: none
Change-Id: I11c81ce4cfb0f51a2fabf92a45d8425647df2121
(cherry picked from commit 7e615a523cd5dae44a7d2b949319f53e6480194e)

services/core/java/com/android/server/accounts/AccountManagerService.java

diff --git a/services/core/java/com/android/server/accounts/AccountManagerService.java b/services/core/java/com/android/server/accounts/AccountManagerService.java
index 27c3ff1..2e04f9c 100644
--- a/services/core/java/com/android/server/accounts/AccountManagerService.java
+++ b/services/core/java/com/android/server/accounts/AccountManagerService.java
@@ -3071,7 +3071,8 @@
                     .setContentTitle(title)
                     .setContentText(subtitle)
                     .setContentIntent(PendingIntent.getActivityAsUser(mContext, 0, intent,
-                            PendingIntent.FLAG_CANCEL_CURRENT, null, user))
+                            PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_IMMUTABLE,
+                            null, user))
                     .build();
         installNotification(getCredentialPermissionNotificationId(
                 account, authTokenType, uid), n, packageName, user.getIdentifier());
@@ -5293,7 +5294,8 @@
                         .setContentTitle(String.format(notificationTitleFormat, account.name))
                         .setContentText(message)
                         .setContentIntent(PendingIntent.getActivityAsUser(
-                                mContext, 0, intent, PendingIntent.FLAG_CANCEL_CURRENT,
+                                mContext, 0, intent,
+                                PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_IMMUTABLE,
                                 null, new UserHandle(userId)))
                         .build();
                 installNotification(id, n, packageName, userId);