diff options
| author | Jeff DeCew <jeffdq@google.com> | 2022-01-14 15:08:22 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-01-28 01:20:09 +0000 |
| commit | 38d57ffe4aae7393c830cccf1b01c55880cf3700 (patch) | |
| tree | 9407a09000f2dfb321ac57a0252593f26ff233a6 | |
| parent | b479d6487827d5ee39f58d76b1b5727b57ea02d1 (diff) | |
| download | base-38d57ffe4aae7393c830cccf1b01c55880cf3700.tar.gz | |
Fix missing group alertOverride recalculation
Bug: 185680162
Test: manual testing w/ telegram and whatsapp
Test: atest NotificationGroupAlertTransferHelperTest
Test: atest NotificationGroupManagerLegacyTest
Merged-In: I4447810af5e2a17c3b6841dfa5cd31703e5f334d
Change-Id: I4447810af5e2a17c3b6841dfa5cd31703e5f334d
(cherry picked from commit 457bab63923c84d13ba1abe6a5857e4a1dd0bd92)
(cherry picked from commit aa6a7754ea82ffe72b9f601997d2e9297d03f786)
Merged-In:I4447810af5e2a17c3b6841dfa5cd31703e5f334d
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/legacy/NotificationGroupManagerLegacy.java | 4 |
1 files changed, 3 insertions, 1 deletions
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); } |