From bcac9410b5aa2e940264d7b8e0d56d9df07b2186 Mon Sep 17 00:00:00 2001
From: Lyn Han <lynhan@google.com>
Date: Thu, 11 Jun 2020 15:35:27 -0700
Subject: [PATCH] Protect against NPE

Fixes: 158786995
Fixes: 158728795
Test: atest
Change-Id: I681d4d3bae8f2f3fd5974e72af96570e94d121eb
---
 .../src/com/android/systemui/bubbles/BubbleStackView.java      | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java
index 001c740164e2e..0d19bdd610293 100644
--- a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java
+++ b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java
@@ -1780,6 +1780,9 @@ public class BubbleStackView extends FrameLayout
                         AnimatableScaleMatrix.getAnimatableValueForScaleFactor(1f),
                         mScaleInSpringConfig)
                 .addUpdateListener((target, values) -> {
+                    if (mExpandedBubble.getIconView() == null) {
+                        return;
+                    }
                     mExpandedViewContainerMatrix.postTranslate(
                             mExpandedBubble.getIconView().getTranslationX()
                                     - bubbleWillBeAtX,