From 7f807071bebd48ff422b5eec09598685dd44e092 Mon Sep 17 00:00:00 2001 From: Ioana Alexandru Date: Thu, 20 Jul 2023 14:07:28 +0000 Subject: [PATCH] Don't attach pipeline to group expansion mgr. This is to avoid a bug where the group state is broken after a notification is removed and then re-added (e.g. after being filtered by zenmode), and ExpandableNotificationRow.areChildrenExpanded ends up out of sync with ExpandableNotificationRow.isGroupExpanded. Bug: 282865576 Test: tested manually that the bug doesn't happen anymore Change-Id: Id3066a9269b9484a30f16bd43236b061b0b6aefe --- .../notification/collection/coordinator/StackCoordinator.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/StackCoordinator.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/StackCoordinator.kt index 62a0d138fd054..5c2f9a8d28ec2 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/StackCoordinator.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/StackCoordinator.kt @@ -39,7 +39,10 @@ class StackCoordinator @Inject internal constructor( override fun attach(pipeline: NotifPipeline) { pipeline.addOnAfterRenderListListener(::onAfterRenderList) - groupExpansionManagerImpl.attach(pipeline) + // TODO(b/282865576): This has an issue where it makes changes to some groups without + // notifying listeners. To be fixed in QPR, but for now let's comment it out to avoid the + // group expansion bug. + // groupExpansionManagerImpl.attach(pipeline) } fun onAfterRenderList(entries: List, controller: NotifStackController) =