From 9ec52264168aa12ae08a6b4f1f48272507336497 Mon Sep 17 00:00:00 2001
From: Mady Mellor <madym@google.com>
Date: Mon, 15 Jun 2020 13:57:31 -0700
Subject: [PATCH] Be super safe

Test: treehugger
Fixes: 158913439
Change-Id: I741a906a41c3557e048d5b946b893d3369b7175f
---
 .../src/com/android/systemui/bubbles/BubbleStackView.java     | 4 +++-
 1 file changed, 3 insertions(+), 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 0e6ce5cbddb80..41dc081245652 100644
--- a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java
+++ b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java
@@ -1905,7 +1905,9 @@ public class BubbleStackView extends FrameLayout
                     updateOverflowVisibility();
 
                     afterExpandedViewAnimation();
-                    previouslySelected.setContentVisibility(false);
+                    if (previouslySelected != null) {
+                        previouslySelected.setContentVisibility(false);
+                    }
                 })
                 .start();
     }