Merge "Guard against an NPE if a view is removed just after a path animation started." into rvc-dev am: 0b90ea2837 am: b5841c0612
Original change: undetermined Change-Id: I5964a2446248c92efb0fb16eed7cf01d4793a44b
This commit is contained in:
@@ -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) {
|
||||||
|
|||||||
Reference in New Issue
Block a user