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

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

Merge "Fix potential IOOB error in icon reordering" into main

parents 49e4227a 697c3986

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

+5 −1
Original line number Diff line number Diff line
@@ -311,12 +311,13 @@ object NotificationIconContainerViewBinder { 
                                boundViewsByNotifKey[it.notifKey]?.first

                            }

                        val childCount = view.childCount

                        val toRemove = mutableListOf<View>()

                        for (i in 0 until childCount) {

                            val actual = view.getChildAt(i)

                            val expected = expectedChildren.getOrNull(i)

                            if (expected == null) {

                                Log.wtf(TAG, "[$logTag] Unexpected child $actual")

                                view.removeView(actual)

                                toRemove.add(actual)

                                continue

                            }

                            if (actual === expected) {
@@ -325,6 +326,9 @@ object NotificationIconContainerViewBinder { 
                            view.removeView(expected)

                            view.addView(expected, i)

                        }

                        for (child in toRemove) {

                            view.removeView(child)

                        }

                    }

                }

            }