Merge "Fix crash due to incorrectly implemented assert"

2021-11-28 17:38:13 +00:00
parent 34b9804e34 b94e498226
commit 6a13e152ed
1 changed files with 2 additions and 2 deletions
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotifPipelineFlags.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotifPipelineFlags.kt
@@ -36,8 +36,8 @@ class NotifPipelineFlags @Inject constructor(
        return false
    }

-    fun assertLegacyPipelineEnabled(): Nothing =
-        error("Old pipeline code running w/ new pipeline enabled")
+    fun assertLegacyPipelineEnabled(): Unit =
+        check(!isNewPipelineEnabled()) { "Old pipeline code running w/ new pipeline enabled" }

    fun isNewPipelineEnabled(): Boolean =
        featureFlags.isEnabled(Flags.NEW_NOTIFICATION_PIPELINE_RENDERING)