From 2592ea1fc8efc6ffebf9fe6e9eb67fd62fae1d4b Mon Sep 17 00:00:00 2001 From: Jeff DeCew Date: Fri, 14 Jan 2022 15:08:22 +0000 Subject: Fix missing group alertOverride recalculation Bug: 185680162 Test: manual testing w/ telegram and whatsapp Test: atest NotificationGroupAlertTransferHelperTest Test: atest NotificationGroupManagerLegacyTest (cherry picked from commit 457bab63923c84d13ba1abe6a5857e4a1dd0bd92) (cherry picked from commit aa6a7754ea82ffe72b9f601997d2e9297d03f786) (cherry picked from commit 38d57ffe4aae7393c830cccf1b01c55880cf3700) Merged-In: I4447810af5e2a17c3b6841dfa5cd31703e5f334d Change-Id: I4447810af5e2a17c3b6841dfa5cd31703e5f334d --- .../collection/legacy/NotificationGroupManagerLegacy.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/legacy/NotificationGroupManagerLegacy.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/legacy/NotificationGroupManagerLegacy.java index 14b9795fe67f..c29905bc7008 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/legacy/NotificationGroupManagerLegacy.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/legacy/NotificationGroupManagerLegacy.java @@ -529,8 +529,10 @@ public class NotificationGroupManagerLegacy implements mIsolatedEntries.put(entry.getKey(), entry.getSbn()); if (groupKeysChanged) { updateSuppression(mGroupMap.get(oldGroupKey)); - updateSuppression(mGroupMap.get(newGroupKey)); } + // Always update the suppression of the group from which you're isolated, in case + // this entry was or now is the alertOverride for that group. + updateSuppression(mGroupMap.get(newGroupKey)); } else if (!wasGroupChild && isGroupChild) { onEntryBecomingChild(entry); } -- cgit v1.2.3-59-g8ed1b