summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Steve Elliott <steell@google.com> 2023-11-15 22:00:33 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2023-11-15 22:00:33 +0000
commit177a544dde4e0a5f619d74182d651cc37dd6606c (patch)
treea99c4f71dc73bcca4980be6a6e420bb68dde7517
parente27ccf7c12fe4e7a5725221e52ed862900350c3f (diff)
parent9aaef7dcc71b4221d46bb55a54701e9c37f4ae88 (diff)
Merge "Remove failed icon bindings on subsequent success" into main
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/notification/icon/ui/viewbinder/NotificationIconContainerViewBinder.kt3
1 files changed, 2 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/icon/ui/viewbinder/NotificationIconContainerViewBinder.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/icon/ui/viewbinder/NotificationIconContainerViewBinder.kt
index a85c440af688..b1e52afd3d8d 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/icon/ui/viewbinder/NotificationIconContainerViewBinder.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/icon/ui/viewbinder/NotificationIconContainerViewBinder.kt
@@ -244,7 +244,7 @@ object NotificationIconContainerViewBinder {
}
// Add and bind.
- val toAdd: Sequence<String> = iconsDiff.added.asSequence() + failedBindings
+ val toAdd: Sequence<String> = iconsDiff.added.asSequence() + failedBindings.toList()
for ((idx, notifKey) in toAdd.withIndex()) {
// Lookup the StatusBarIconView from the store.
val sbiv = viewStore.iconView(notifKey)
@@ -252,6 +252,7 @@ object NotificationIconContainerViewBinder {
failedBindings.add(notifKey)
continue
}
+ failedBindings.remove(notifKey)
// The view might still be transiently added if it was just removed and added
// again
view.removeTransientView(sbiv)