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

Merge "Add IMMUTABLE flag to AccountManager pending intents." into rvc-qpr-dev am: 501a44ccfb

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13407648

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic6f7494ffaf88f474d6208d6bfe8cac81793d76c
This commit is contained in:
Dmitry Dementyev
2021-03-05 04:24:56 +00:00
committed by Automerger Merge Worker
parent e7aa8a61f1 501a44ccfb
commit 3f1365e873
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/accounts/AccountManagerService.java
View File

@@ -3071,7 +3071,8 @@ public class AccountManagerService
.setContentTitle(title) .setContentTitle(title)
.setContentText(subtitle) .setContentText(subtitle)
.setContentIntent(PendingIntent.getActivityAsUser(mContext, 0, intent, .setContentIntent(PendingIntent.getActivityAsUser(mContext, 0, intent,
PendingIntent.FLAG_CANCEL_CURRENT, null, user)) PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_IMMUTABLE,
null, user))
.build(); .build();
installNotification(getCredentialPermissionNotificationId( installNotification(getCredentialPermissionNotificationId(
account, authTokenType, uid), n, packageName, user.getIdentifier()); account, authTokenType, uid), n, packageName, user.getIdentifier());
@@ -5293,7 +5294,8 @@ public class AccountManagerService
.setContentTitle(String.format(notificationTitleFormat, account.name)) .setContentTitle(String.format(notificationTitleFormat, account.name))
.setContentText(message) .setContentText(message)
.setContentIntent(PendingIntent.getActivityAsUser( .setContentIntent(PendingIntent.getActivityAsUser(
mContext, 0, intent, PendingIntent.FLAG_CANCEL_CURRENT, mContext, 0, intent,
PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_IMMUTABLE,
null, new UserHandle(userId))) null, new UserHandle(userId)))
.build(); .build();
installNotification(id, n, packageName, userId); installNotification(id, n, packageName, userId);