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

Commit da596922 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Move Accounts NotificationChannel earlier, before clearCallingIdentity"

parents 9a4b2ab1 4d0f0857

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

+1 −1
Original line number Diff line number Diff line
@@ -4891,7 +4891,6 @@ public class AccountManagerService 


    private void installNotification(int notificationId, final Notification notification,

            String packageName, int userId) {

        SystemNotificationChannels.createAccountChannelForPackage(packageName, mContext);

        final long token = clearCallingIdentity();

        try {

            INotificationManager notificationManager = mInjector.getNotificationManager();
@@ -5678,6 +5677,7 @@ public class AccountManagerService 
            synchronized (mUsers) {

                userAccounts = mUsers.get(userId);

            }

            SystemNotificationChannels.createAccountChannelForPackage(packageName, mContext);

            doNotification(userAccounts, account, null, intent, packageName, userId);

        }

services/core/java/com/android/server/notification/NotificationManagerService.java

+2 −1
Original line number Diff line number Diff line
@@ -3109,7 +3109,8 @@ public class NotificationManagerService extends SystemService { 
                        + " - notification=" + notification);

                return;

            }

            throw new IllegalArgumentException("No Channel found for notification=" + notification);

            throw new IllegalArgumentException("No Channel found for channelId=" + channelId

                    + ", notification=" + notification);

        }

        final StatusBarNotification n = new StatusBarNotification(

                pkg, opPkg, id, tag, notificationUid, callingPid, notification,