Merge "Fix repeat HUNs after autogrouping" into main (448853d0) · Commits · e / os / android_frameworks_base

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

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1075,6 +1075,7 @@ public class NotificationManagerService extends SystemService {
	summary.getSbn().getNotification().getGroupAlertBehavior();		summary.getSbn().getNotification().getGroupAlertBehavior();

	if (notificationForceGrouping()) {		if (notificationForceGrouping()) {
			summary.getNotification().flags \|= Notification.FLAG_SILENT;
	if (!summary.getChannel().getId().equals(summaryAttr.channelId)) {		if (!summary.getChannel().getId().equals(summaryAttr.channelId)) {
	NotificationChannel newChannel = mPreferencesHelper.getNotificationChannel(pkg,		NotificationChannel newChannel = mPreferencesHelper.getNotificationChannel(pkg,
	summary.getUid(), summaryAttr.channelId, false);		summary.getUid(), summaryAttr.channelId, false);
	@@ -7450,6 +7451,7 @@ public class NotificationManagerService extends SystemService {
	// Override group key early for forced grouped notifications		// Override group key early for forced grouped notifications
	r.setOverrideGroupKey(groupName);		r.setOverrideGroupKey(groupName);
	}		}
			r.getNotification().flags \|= Notification.FLAG_SILENT;
	}		}

	addAutoGroupAdjustment(r, groupName);		addAutoGroupAdjustment(r, groupName);