From e1ee90edbfe4704ac3e6e14a54181b4d7fc5787d Mon Sep 17 00:00:00 2001
From: Mady Mellor <madym@google.com>
Date: Tue, 23 Jun 2020 18:32:05 -0700
Subject: [PATCH] Fix possible NPE

Test: treehugger
Bug: 159754859
Change-Id: I6de78cd0b7e27eaeab8d1673f12aa948d93f603a
---
 .../src/com/android/systemui/bubbles/BubbleStackView.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java
index 50828e8781545..866ae03f074fb 100644
--- a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java
+++ b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java
@@ -1898,7 +1898,7 @@ public class BubbleStackView extends FrameLayout
                             AnimatableScaleMatrix.getAnimatableValueForScaleFactor(1f),
                             mScaleInSpringConfig)
                     .addUpdateListener((target, values) -> {
-                        if (mExpandedBubble.getIconView() == null) {
+                        if (mExpandedBubble == null || mExpandedBubble.getIconView() == null) {
                             return;
                         }
                         mExpandedViewContainerMatrix.postTranslate(