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

Commit 448853d0 authored by Julia Reynolds's avatar Julia Reynolds Committed by Android (Google) Code Review
Browse files

Merge "Fix repeat HUNs after autogrouping" into main

parents f51c7e13 659cd955

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

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















        if (notificationForceGrouping()) {













            summary.getNotification().flags |= Notification.FLAG_SILENT;















            if (!summary.getChannel().getId().equals(summaryAttr.channelId)) {















                NotificationChannel newChannel = mPreferencesHelper.getNotificationChannel(pkg,















                        summary.getUid(), summaryAttr.channelId, false);










@@ -7450,6 +7451,7 @@ public class NotificationManagerService extends SystemService {













                    // Override group key early for forced grouped notifications















                    r.setOverrideGroupKey(groupName);















                }













                r.getNotification().flags |= Notification.FLAG_SILENT;















            }





























            addAutoGroupAdjustment(r, groupName);