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

Commit 94d5a8e2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Guard against an NPE if a view is removed just after a path animation... 

Merge "Guard against an NPE if a view is removed just after a path animation started." into rvc-dev am: 0b90ea28 am: e0e0aff0 am: e231852c am: 028d3917

Original change: undetermined

Change-Id: Ic8b8c9a7c8ca1d52c0416183c36def69be6264f6
parents 66e396e3 028d3917

packages/SystemUI/src/com/android/systemui/bubbles/animation/PhysicsAnimationLayout.java

+5 −0
Original line number Original line Diff line number Diff line
@@ -1037,6 +1037,11 @@ public class PhysicsAnimationLayout extends FrameLayout { 
            if (view != null) {

            if (view != null) {

                final SpringAnimation animation =

                final SpringAnimation animation =

                        (SpringAnimation) view.getTag(getTagIdForProperty(property));

                        (SpringAnimation) view.getTag(getTagIdForProperty(property));



                if (animation == null) {

                    return;

                }



                final SpringForce animationSpring = animation.getSpring();

                final SpringForce animationSpring = animation.getSpring();





                if (animationSpring == null) {

                if (animationSpring == null) {