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

Commit 94ddf1f0 authored by Mady Mellor's avatar Mady Mellor
Browse files

Protect against possible NPE 

Bug: 316651738
Test: none / treehugger
Change-Id: Ia0a154901e3a9b556004ff52416e44beb73804a1
parent 4881667c

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/animation/StackAnimationController.java

+4 −2
Original line number Diff line number Diff line
@@ -769,9 +769,11 @@ public class StackAnimationController extends 
        boolean swapped = false;

        for (int newIndex = 0; newIndex < bubbleViews.size(); newIndex++) {

            View view = bubbleViews.get(newIndex);

            if (view != null) {

                final int oldIndex = mLayout.indexOfChild(view);

                swapped |= animateSwap(view, oldIndex, newIndex, updateAllIcons, after);

            }

        }

        if (!swapped) {

            // All bubbles were at the right position. Make sure badges and z order is correct.

            updateAllIcons.run();