commit c1a75a9fbbc0d7adc07e219009fd83c854546099
author Mady Mellor <madym@google.com> Thu Jun 11 22:24:24 2020 -0700
committer Mady Mellor <madym@google.com> Thu Jun 11 23:07:29 2020 -0700
tree 230513dfa78eeacfae775a497779b1832997dce1
parent ec10faabd4af875b000df433553ee1720ab9803c

Fix an obscure NPE

Test: treehugger
Fixes: 157660321
Change-Id: I0ad1b45e277bcbd1a4017de009033291968a7b69

packages/SystemUI/src/com/android/systemui/bubbles/BubbleExpandedView.java

diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleExpandedView.java b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleExpandedView.java
index 47e6645..6dcc9dc 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 @@
                             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);