diff options
| author | 2020-06-01 16:38:02 -0400 | |
|---|---|---|
| committer | 2020-06-01 16:38:21 -0400 | |
| commit | 78d87b0047db3914f4d3aa62066f25f48bdf5742 (patch) | |
| tree | b5426c95fb0209cf9204309cf809eb7e4de24361 | |
| parent | af9a747e333a1f5ca8f2df8945ca9357d4b337c9 (diff) | |
Guard against an NPE if a view is removed just after a path animation started.
Fixes: 157071931
Test: atest SystemUITests
Change-Id: I8daa96267db4c40734f6b8212b9b79e48120f9e6
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/bubbles/animation/PhysicsAnimationLayout.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/animation/PhysicsAnimationLayout.java b/packages/SystemUI/src/com/android/systemui/bubbles/animation/PhysicsAnimationLayout.java index 942b9a74bb86..98a7cc23c67e 100644 --- a/packages/SystemUI/src/com/android/systemui/bubbles/animation/PhysicsAnimationLayout.java +++ b/packages/SystemUI/src/com/android/systemui/bubbles/animation/PhysicsAnimationLayout.java @@ -1037,6 +1037,11 @@ public class PhysicsAnimationLayout extends FrameLayout { if (view != null) { final SpringAnimation animation = (SpringAnimation) view.getTag(getTagIdForProperty(property)); + + if (animation == null) { + return; + } + final SpringForce animationSpring = animation.getSpring(); if (animationSpring == null) { |