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

Change-Id: I50e989c50ca34b94372562b0ca4e2545d5a8e2b6
2020-04-06 21:44:37 +00:00
parent 35745e4d4f f833d5be76
commit d7eb7e9fc8
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)