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

Commit d14ff733 authored by Mykola Podolian's avatar Mykola Podolian Committed by Android (Google) Code Review
Browse files

Merge "Ensure non null references for animateReorder() method." into main

parents 6459e98b f34ea0a2

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

+5 −1
Original line number Diff line number Diff line
@@ -765,8 +765,10 @@ public class StackAnimationController extends 
        Runnable updateAllIcons = () -> {

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

                View view = bubbleViews.get(newIndex);

                if (view != null) {

                    updateBadgesAndZOrder(view, newIndex);

                }

            }

        };



        boolean swapped = false;
@@ -775,6 +777,8 @@ public class StackAnimationController extends 
            if (view != null) {

                final int oldIndex = mLayout.indexOfChild(view);

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

            } else {

                Log.w(TAG, "bubbleViews[" + newIndex + "] is null");

            }

        }

        if (!swapped) {