summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Caitlin Shkuratov <caitlinshk@google.com> 2024-11-20 16:29:31 +0000
committer Caitlin Shkuratov <caitlinshk@google.com> 2024-11-20 16:29:31 +0000
commitc6d18dc3d2cc6b256e91f78b9cb76b5ce59bdf87 (patch)
treefcb6eb4cfe3bc0689ab75af574d4042fdaf6f75e
parent5ed6634e13e9bbc655401e065585d568394fb691 (diff)
Only call NotifEntry#getPromotedNotifContentModel when flag enabled.
NotificationEntry#getPromotedNotificationContentModel does a Log.wtf if the flag isn't enabled, but RenderNotificationListInteractor was accidentally calling #getPromotedNotificationContentModel even if the flag was disabled. Bug: 369151941 Change-Id: Ie1ac8c963177ca5d6dc2601def3e88169274a312 Test: No WTF logs Flag: android.app.ui_rich_ongoing Flag: com.android.systemui.status_bar_notification_chips
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/notification/domain/interactor/RenderNotificationListInteractor.kt9
1 files changed, 8 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/domain/interactor/RenderNotificationListInteractor.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/domain/interactor/RenderNotificationListInteractor.kt
index 8edbc5e8e4bb..8bd7a1ab7a77 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/domain/interactor/RenderNotificationListInteractor.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/domain/interactor/RenderNotificationListInteractor.kt
@@ -152,6 +152,13 @@ private class ActiveNotificationsStoreBuilder(
} else {
null
}
+ val promotedContent =
+ if (PromotedNotificationContentModel.featureFlagEnabled()) {
+ promotedNotificationContentModel
+ } else {
+ null
+ }
+
return existingModels.createOrReuse(
key = key,
groupKey = sbn.groupKey,
@@ -174,7 +181,7 @@ private class ActiveNotificationsStoreBuilder(
isGroupSummary = sbn.notification.isGroupSummary,
bucket = bucket,
callType = sbn.toCallType(),
- promotedContent = promotedNotificationContentModel,
+ promotedContent = promotedContent,
)
}
}