Skip to content

Commit 0b90ea2

Browse files
TreeHugger RobotAndroid (Google) Code Review
authored andcommitted
Merge "Guard against an NPE if a view is removed just after a path animation started." into rvc-dev
2 parents 9d4f385 + 78d87b0 commit 0b90ea2

1 file changed

Lines changed: 5 additions & 0 deletions

File tree

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1037,6 +1037,11 @@ private void updateValueForChild(
10371037
if (view != null) {
10381038
final SpringAnimation animation =
10391039
(SpringAnimation) view.getTag(getTagIdForProperty(property));
1040+
1041+
if (animation == null) {
1042+
return;
1043+
}
1044+
10401045
final SpringForce animationSpring = animation.getSpring();
10411046

10421047
if (animationSpring == null) {

0 commit comments

Comments
 (0)