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

Commit d36f0ec9 authored by Mady Mellor's avatar Mady Mellor Committed by Automerger Merge Worker
Browse files

Merge "Fix potential NPE when looking up view tags for animating" into udc-dev am: a57a7086 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23716020



Change-Id: If266a47ef6c3e6705996ccc17043e7273d094089
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5203644f a57a7086

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/animation/PhysicsAnimationLayout.java

+3 −0
Original line number Diff line number Diff line
@@ -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);

    }