From c1a75a9fbbc0d7adc07e219009fd83c854546099 Mon Sep 17 00:00:00 2001
From: Mady Mellor <madym@google.com>
Date: Thu, 11 Jun 2020 22:24:24 -0700
Subject: [PATCH] Fix an obscure NPE

Test: treehugger
Fixes: 157660321
Change-Id: I0ad1b45e277bcbd1a4017de009033291968a7b69
---
 .../src/com/android/systemui/bubbles/BubbleExpandedView.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleExpandedView.java b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleExpandedView.java
index 47e6645d347fe..6dcc9dcdc63ce 100644
--- a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleExpandedView.java
+++ b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleExpandedView.java
@@ -163,6 +163,11 @@ public class BubbleExpandedView extends LinearLayout {
                             Log.d(TAG, "onActivityViewReady: calling startActivity, "
                                     + "bubble=" + getBubbleKey());
                         }
+                        if (mActivityView == null) {
+                            mBubbleController.removeBubble(getBubbleKey(),
+                                    BubbleController.DISMISS_INVALID_INTENT);
+                            return;
+                        }
                         try {
                             if (!mIsOverflow && mBubble.usingShortcutInfo()) {
                                 options.setApplyActivityFlagsForBubbles(true);