Merge "Move Accounts NotificationChannel earlier, before clearCallingIdentity"
diff --git a/services/core/java/com/android/server/accounts/AccountManagerService.java b/services/core/java/com/android/server/accounts/AccountManagerService.java
index 1a7f016..490e63d 100644
--- a/services/core/java/com/android/server/accounts/AccountManagerService.java
+++ b/services/core/java/com/android/server/accounts/AccountManagerService.java
@@ -4891,7 +4891,6 @@
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 @@
synchronized (mUsers) {
userAccounts = mUsers.get(userId);
}
+ SystemNotificationChannels.createAccountChannelForPackage(packageName, mContext);
doNotification(userAccounts, account, null, intent, packageName, userId);
}
diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java
index fa73b6b..7e10a09 100644
--- a/services/core/java/com/android/server/notification/NotificationManagerService.java
+++ b/services/core/java/com/android/server/notification/NotificationManagerService.java
@@ -3109,7 +3109,8 @@
+ " - 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,