From 3bf70952a2ed5ff4738c16eba6131e7d8fa4e7bb Mon Sep 17 00:00:00 2001 From: Steve Elliott Date: Tue, 28 Jun 2022 17:07:54 -0400 Subject: [PATCH] Inline notif pipeline flag into new pipeline code This change is a no-op; the flag is now enabled-by-default, so all removed code paths here are effectively dead. Bug: 200269355 Test: atest SystemUITests Change-Id: I8e1b0eb0a6cd7b43e1ff3cb5292d187f46810202 Merged-In: I8e1b0eb0a6cd7b43e1ff3cb5292d187f46810202 --- .../collection/NotifCollection.java | 10 ++++------ .../notification/collection/NotifPipeline.kt | 3 --- .../coordinator/BubbleCoordinator.java | 8 -------- .../coordinator/NotifCoordinators.kt | 18 ++++++----------- .../SmartspaceDedupingCoordinator.kt | 7 ------- .../coordinator/ViewConfigCoordinator.kt | 8 +++----- .../init/NotifPipelineInitializer.java | 20 ++++++------------- .../collection/NotifCollectionTest.java | 2 -- .../coordinator/ViewConfigCoordinatorTest.kt | 1 - 9 files changed, 19 insertions(+), 58 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotifCollection.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotifCollection.java index e345aabc62158..d17c8f8e42c51 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotifCollection.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotifCollection.java @@ -578,12 +578,10 @@ public class NotifCollection implements Dumpable { // TODO: (b/145659174) update the sbn's overrideGroupKey in // NotificationEntry.setRanking instead of here once we fully migrate to the // NewNotifPipeline - if (mNotifPipelineFlags.isNewPipelineEnabled()) { - final String newOverrideGroupKey = ranking.getOverrideGroupKey(); - if (!Objects.equals(entry.getSbn().getOverrideGroupKey(), - newOverrideGroupKey)) { - entry.getSbn().setOverrideGroupKey(newOverrideGroupKey); - } + final String newOverrideGroupKey = ranking.getOverrideGroupKey(); + if (!Objects.equals(entry.getSbn().getOverrideGroupKey(), + newOverrideGroupKey)) { + entry.getSbn().setOverrideGroupKey(newOverrideGroupKey); } } else { if (currentEntriesWithoutRankings == null) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotifPipeline.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotifPipeline.kt index e3ee8139d71c4..a57440c95271c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotifPipeline.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/NotifPipeline.kt @@ -76,7 +76,6 @@ import javax.inject.Inject */ @SysUISingleton class NotifPipeline @Inject constructor( - notifPipelineFlags: NotifPipelineFlags, private val mNotifCollection: NotifCollection, private val mShadeListBuilder: ShadeListBuilder, private val mRenderStageManager: RenderStageManager @@ -107,8 +106,6 @@ class NotifPipeline @Inject constructor( return mNotifCollection.getEntry(key) } - val isNewPipelineEnabled: Boolean = notifPipelineFlags.isNewPipelineEnabled() - /** * Registers a lifetime extender. Lifetime extenders can cause notifications that have been * dismissed or retracted by system server to be temporarily retained in the collection. 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 b923fdfe6be80..7293953eb8d3c 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 @@ -127,14 +127,6 @@ public class BubbleCoordinator implements Coordinator { DismissedByUserStats dismissedByUserStats, int reason ) { - if (!mNotifPipeline.isNewPipelineEnabled()) { - // The `entry` will be from whichever pipeline is active, so if the old pipeline is - // running, make sure that we use the new pipeline's entry (if it still exists). - NotificationEntry newPipelineEntry = mNotifPipeline.getEntry(entry.getKey()); - if (newPipelineEntry != null) { - entry = newPipelineEntry; - } - } if (isInterceptingDismissal(entry)) { mInterceptedDismissalEntries.remove(entry.getKey()); mOnEndDismissInterception.onEndDismissInterception(mDismissInterceptor, entry, diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/NotifCoordinators.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/NotifCoordinators.kt index 359e2028d9f3f..891e25ef6c25f 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/NotifCoordinators.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/NotifCoordinators.kt @@ -72,9 +72,7 @@ class NotifCoordinatorsImpl @Inject constructor( // pipeline, such as this DataStoreCoordinator which cannot be removed, as it's a critical // glue between the pipeline and parts of SystemUI which depend on pipeline output via the // NotifLiveDataStore. - if (notifPipelineFlags.isNewPipelineEnabled()) { - mCoordinators.add(dataStoreCoordinator) - } + mCoordinators.add(dataStoreCoordinator) // Attach normal coordinators. mCoordinators.add(hideLocallyDismissedNotifsCoordinator) @@ -97,18 +95,14 @@ class NotifCoordinatorsImpl @Inject constructor( if (notifPipelineFlags.isSmartspaceDedupingEnabled()) { mCoordinators.add(smartspaceDedupingCoordinator) } - if (notifPipelineFlags.isNewPipelineEnabled()) { - mCoordinators.add(headsUpCoordinator) - mCoordinators.add(gutsCoordinator) - mCoordinators.add(preparationCoordinator) - mCoordinators.add(remoteInputCoordinator) - } + mCoordinators.add(headsUpCoordinator) + mCoordinators.add(gutsCoordinator) + mCoordinators.add(preparationCoordinator) + mCoordinators.add(remoteInputCoordinator) // Manually add Ordered Sections // HeadsUp > FGS > People > Alerting > Silent > Minimized > Unknown/Default - if (notifPipelineFlags.isNewPipelineEnabled()) { - mOrderedSections.add(headsUpCoordinator.sectioner) // HeadsUp - } + mOrderedSections.add(headsUpCoordinator.sectioner) mOrderedSections.add(appOpsCoordinator.sectioner) // ForegroundService mOrderedSections.add(conversationCoordinator.sectioner) // People mOrderedSections.add(rankingCoordinator.alertingSectioner) // Alerting diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/SmartspaceDedupingCoordinator.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/SmartspaceDedupingCoordinator.kt index 48f00ac4bf551..ce361ea88bdc7 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/SmartspaceDedupingCoordinator.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/SmartspaceDedupingCoordinator.kt @@ -65,13 +65,6 @@ class SmartspaceDedupingCoordinator @Inject constructor( statusBarStateController.addCallback(statusBarStateListener) smartspaceController.addListener(this::onNewSmartspaceTargets) - if (!pipeline.isNewPipelineEnabled) { - // TODO (b/173126564): Remove this once the old pipeline is no longer necessary - notificationLockscreenUserManager.addKeyguardNotificationSuppressor { entry -> - isDupedWithSmartspaceContent(entry) - } - } - recordStatusBarState(statusBarStateController.state) } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/ViewConfigCoordinator.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/ViewConfigCoordinator.kt index bae16fe835f1a..5a281b130347e 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/ViewConfigCoordinator.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/ViewConfigCoordinator.kt @@ -70,11 +70,9 @@ class ViewConfigCoordinator @Inject internal constructor( override fun attach(pipeline: NotifPipeline) { mPipeline = pipeline - if (pipeline.isNewPipelineEnabled) { - mLockscreenUserManager.addUserChangedListener(mUserChangedListener) - mConfigurationController.addCallback(this) - mKeyguardUpdateMonitor.registerCallback(mKeyguardUpdateCallback) - } + mLockscreenUserManager.addUserChangedListener(mUserChangedListener) + mConfigurationController.addCallback(this) + mKeyguardUpdateMonitor.registerCallback(mKeyguardUpdateCallback) } override fun onDensityOrFontScaleChanged() { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/init/NotifPipelineInitializer.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/init/NotifPipelineInitializer.java index 70b11569f50be..24ef5808b2e31 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/init/NotifPipelineInitializer.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/init/NotifPipelineInitializer.java @@ -22,7 +22,6 @@ import com.android.systemui.Dumpable; import com.android.systemui.dagger.SysUISingleton; import com.android.systemui.dump.DumpManager; import com.android.systemui.statusbar.NotificationListener; -import com.android.systemui.statusbar.notification.NotifPipelineFlags; import com.android.systemui.statusbar.notification.collection.NotifCollection; import com.android.systemui.statusbar.notification.collection.NotifInflaterImpl; import com.android.systemui.statusbar.notification.collection.NotifPipeline; @@ -53,7 +52,6 @@ public class NotifPipelineInitializer implements Dumpable { private final NotifInflaterImpl mNotifInflater; private final DumpManager mDumpManager; private final ShadeViewManagerFactory mShadeViewManagerFactory; - private final NotifPipelineFlags mNotifPipelineFlags; @Inject @@ -66,8 +64,7 @@ public class NotifPipelineInitializer implements Dumpable { NotifCoordinators notifCoordinators, NotifInflaterImpl notifInflater, DumpManager dumpManager, - ShadeViewManagerFactory shadeViewManagerFactory, - NotifPipelineFlags notifPipelineFlags + ShadeViewManagerFactory shadeViewManagerFactory ) { mPipelineWrapper = pipelineWrapper; mGroupCoalescer = groupCoalescer; @@ -78,7 +75,6 @@ public class NotifPipelineInitializer implements Dumpable { mDumpManager = dumpManager; mNotifInflater = notifInflater; mShadeViewManagerFactory = shadeViewManagerFactory; - mNotifPipelineFlags = notifPipelineFlags; } /** Hooks the new pipeline up to NotificationManager */ @@ -91,26 +87,22 @@ public class NotifPipelineInitializer implements Dumpable { mDumpManager.registerDumpable("NotifPipeline", this); // Setup inflation - if (mNotifPipelineFlags.isNewPipelineEnabled()) { - mNotifInflater.setRowBinder(rowBinder); - } + mNotifInflater.setRowBinder(rowBinder); // Wire up coordinators mNotifPluggableCoordinators.attach(mPipelineWrapper); // Wire up pipeline - if (mNotifPipelineFlags.isNewPipelineEnabled()) { - mShadeViewManagerFactory - .create(listContainer, stackController) - .attach(mRenderStageManager); - } + mShadeViewManagerFactory + .create(listContainer, stackController) + .attach(mRenderStageManager); mRenderStageManager.attach(mListBuilder); mListBuilder.attach(mNotifCollection); mNotifCollection.attach(mGroupCoalescer); mGroupCoalescer.attach(notificationService); Log.d(TAG, "Notif pipeline initialized." - + " rendering=" + mNotifPipelineFlags.isNewPipelineEnabled()); + + " rendering=" + true); } @Override diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/NotifCollectionTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/NotifCollectionTest.java index f286349971d27..4160109b09c47 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/NotifCollectionTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/NotifCollectionTest.java @@ -152,8 +152,6 @@ public class NotifCollectionTest extends SysuiTestCase { MockitoAnnotations.initMocks(this); allowTestableLooperAsMainThread(); - when(mNotifPipelineFlags.isNewPipelineEnabled()).thenReturn(true); - when(mEulogizer.record(any(Exception.class))).thenAnswer(i -> i.getArguments()[0]); mListenerInOrder = inOrder(mCollectionListener); diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/ViewConfigCoordinatorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/ViewConfigCoordinatorTest.kt index 5ba926e29087b..0830191fe035f 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/ViewConfigCoordinatorTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/ViewConfigCoordinatorTest.kt @@ -60,7 +60,6 @@ class ViewConfigCoordinatorTest : SysuiTestCase() { @Before fun setUp() { - whenever(pipeline.isNewPipelineEnabled).thenReturn(true) whenever(pipeline.allNotifs).thenReturn(listOf(entry)) whenever(entry.row).thenReturn(row) coordinator = ViewConfigCoordinator(