From 1f72161a152ecfcc447d46c159e5d5bbcb13f659 Mon Sep 17 00:00:00 2001 From: Jeff DeCew Date: Fri, 3 Jun 2022 14:45:16 +0000 Subject: [PATCH] New Pipeline: isNewPipelineEnabled() is always true. This just deletes Flags.NEW_NOTIFICATION_PIPELINE_RENDERING and returns true where it was used. Change-Id: If2e36064a7b8dfc1f27ec046818ee68696a7e387 Test: attempt to disable flag; new pipeline stays on. Bug: 200269355 --- packages/SystemUI/src/com/android/systemui/flags/Flags.java | 3 --- .../systemui/statusbar/notification/NotifPipelineFlags.kt | 3 +-- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/flags/Flags.java b/packages/SystemUI/src/com/android/systemui/flags/Flags.java index 55bbcb654cf5e..4d08036523a31 100644 --- a/packages/SystemUI/src/com/android/systemui/flags/Flags.java +++ b/packages/SystemUI/src/com/android/systemui/flags/Flags.java @@ -43,9 +43,6 @@ public class Flags { /***************************************/ // 100 - notification - public static final BooleanFlag NEW_NOTIFICATION_PIPELINE_RENDERING = - new BooleanFlag(101, true); - public static final BooleanFlag NOTIFICATION_PIPELINE_DEVELOPER_LOGGING = new BooleanFlag(103, false); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotifPipelineFlags.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotifPipelineFlags.kt index f6a55e6b75c66..478f7aa8ce09e 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotifPipelineFlags.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotifPipelineFlags.kt @@ -48,8 +48,7 @@ class NotifPipelineFlags @Inject constructor( fun assertLegacyPipelineEnabled(): Unit = check(!isNewPipelineEnabled()) { "Old pipeline code running w/ new pipeline enabled" } - fun isNewPipelineEnabled(): Boolean = - featureFlags.isEnabled(Flags.NEW_NOTIFICATION_PIPELINE_RENDERING) + fun isNewPipelineEnabled(): Boolean = true fun isDevLoggingEnabled(): Boolean = featureFlags.isEnabled(Flags.NOTIFICATION_PIPELINE_DEVELOPER_LOGGING)