Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f1e061b2 authored by Dmitry Dementyev's avatar Dmitry Dementyev Committed by Android (Google) Code Review
Browse files

Merge "Add IMMUTABLE flag to AccountManager pending intents."

parents b6569a04 7e615a52

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

+4 −2
Original line number Original line Diff line number Diff line
@@ -3085,7 +3085,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());
@@ -5307,7 +5308,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);