From f0c64c33b3ffd77b0fd4a590eaf23927dbf2f164 Mon Sep 17 00:00:00 2001 From: Mady Mellor Date: Thu, 15 Jun 2023 17:13:55 -0700 Subject: [PATCH] Fix potential NPE when looking up view tags for animating Test: none / treehugger Bug: 287395150 Change-Id: I5c4142841115f152070a38ad21a51494cfa7ab0a --- .../wm/shell/bubbles/animation/PhysicsAnimationLayout.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/animation/PhysicsAnimationLayout.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/animation/PhysicsAnimationLayout.java index 55052e614458d..beb1c5fa6c102 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/animation/PhysicsAnimationLayout.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/animation/PhysicsAnimationLayout.java @@ -523,6 +523,7 @@ public class PhysicsAnimationLayout extends FrameLayout { */ @Nullable private SpringAnimation getSpringAnimationFromView( DynamicAnimation.ViewProperty property, View view) { + if (view == null) return null; return (SpringAnimation) view.getTag(getTagIdForProperty(property)); } @@ -531,11 +532,13 @@ public class PhysicsAnimationLayout extends FrameLayout { * system. */ @Nullable private ViewPropertyAnimator getViewPropertyAnimatorFromView(View view) { + if (view == null) return null; return (ViewPropertyAnimator) view.getTag(R.id.reorder_animator_tag); } /** Retrieves the target animator from the view via the view tag system. */ @Nullable private ObjectAnimator getTargetAnimatorFromView(View view) { + if (view == null) return null; return (ObjectAnimator) view.getTag(R.id.target_animator_tag); }