Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 80c408f3 authored by Steve Elliott's avatar Steve Elliott Committed by Android (Google) Code Review
Browse files

Merge "Fix IndexOOBException when adding icons to NIC" into main

parents e434d879 1a155d26

packages/SystemUI/src/com/android/systemui/statusbar/notification/icon/ui/viewbinder/NotificationIconContainerViewBinder.kt

+2 −2
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ object NotificationIconContainerViewBinder { 


                // Add and bind.

                val toAdd: Sequence<String> = iconsDiff.added.asSequence() + failedBindings.toList()

                for ((idx, notifKey) in toAdd.withIndex()) {

                for (notifKey in toAdd) {

                    // Lookup the StatusBarIconView from the store.

                    val sbiv = viewStore.iconView(notifKey)

                    if (sbiv == null) {
@@ -256,7 +256,7 @@ object NotificationIconContainerViewBinder { 
                        // added again.

                        removeTransientView(sbiv)

                    }

                    view.addView(sbiv, idx)

                    view.addView(sbiv)

                    boundViewsByNotifKey.remove(notifKey)?.second?.cancel()

                    boundViewsByNotifKey[notifKey] =

                        Pair(