From 43c49e7754f159144306476ef61da9402e66e408 Mon Sep 17 00:00:00 2001 From: Jeff DeCew Date: Tue, 28 Dec 2021 18:46:49 +0000 Subject: [PATCH] New Pipeline: Ensure finalize filter stage is not used unnecessarily. Test: manually test media Change-Id: I83b6f4ba6711d371a0ceb485316a61e284e79374 --- .../collection/coordinator/BubbleCoordinator.java | 7 ++----- .../collection/coordinator/KeyguardCoordinator.java | 1 + .../collection/coordinator/MediaCoordinator.java | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/BubbleCoordinator.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/BubbleCoordinator.java index e9b7caa565aca..85c0064e79832 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/BubbleCoordinator.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/BubbleCoordinator.java @@ -82,11 +82,8 @@ public class BubbleCoordinator implements Coordinator { public void attach(NotifPipeline pipeline) { mNotifPipeline = pipeline; mNotifPipeline.addNotificationDismissInterceptor(mDismissInterceptor); - mNotifPipeline.addFinalizeFilter(mNotifFilter); - if (mBubblesManagerOptional.isPresent()) { - mBubblesManagerOptional.get().addNotifCallback(mNotifCallback); - } - + mNotifPipeline.addPreGroupFilter(mNotifFilter); + mBubblesManagerOptional.ifPresent(manager -> manager.addNotifCallback(mNotifCallback)); } private final NotifFilter mNotifFilter = new NotifFilter(TAG) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/KeyguardCoordinator.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/KeyguardCoordinator.java index fe1cd7b98cf9b..33005b34ff988 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/KeyguardCoordinator.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/KeyguardCoordinator.java @@ -90,6 +90,7 @@ public class KeyguardCoordinator implements Coordinator { readShowSilentNotificationSetting(); setupInvalidateNotifListCallbacks(); + // Filter at the "finalize" stage so that views remain bound by PreparationCoordinator pipeline.addFinalizeFilter(mNotifFilter); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/MediaCoordinator.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/MediaCoordinator.java index 8769969834c80..ecee00641cd3f 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/MediaCoordinator.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/MediaCoordinator.java @@ -49,6 +49,6 @@ public class MediaCoordinator implements Coordinator { @Override public void attach(NotifPipeline pipeline) { - pipeline.addFinalizeFilter(mMediaFilter); + pipeline.addPreGroupFilter(mMediaFilter); } }