Merge "Fix NPE when bubble being dragged out" into rvc-dev am: f9dea8b4b3

Change-Id: Ic257c29d09dbfb0b0674a074285230bf34da72dd
2020-04-06 21:25:59 +00:00
parent fc20543c15 f9dea8b4b3
commit 70a5800fb3
1 changed files with 3 additions and 0 deletions
--- a/packages/SystemUI/src/com/android/systemui/bubbles/animation/ExpandedAnimationController.java
+++ b/packages/SystemUI/src/com/android/systemui/bubbles/animation/ExpandedAnimationController.java
@@ -323,6 +323,9 @@ public class ExpandedAnimationController

    /** Plays a dismiss animation on the dragged out bubble. */
    public void dismissDraggedOutBubble(View bubble, Runnable after) {
+        if (bubble == null) {
+            return;
+        }
        animationForChild(bubble)
                .withStiffness(SpringForce.STIFFNESS_HIGH)
                .scaleX(1.1f)