From e37f60b39656621717ea092c2bb09c00b0786d5d Mon Sep 17 00:00:00 2001
From: Mady Mellor <madym@google.com>
Date: Mon, 25 Mar 2019 14:48:34 -0700
Subject: [PATCH] Make sure we have an expanded bubble in onConfigChange

Test: manual
Fixes: 129269766
Change-Id: Ic908b8f9b1c2a2bb87a8b0789c5616193152deaf
---
 .../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 580acb82ebc1a..c9228de5802a8 100644
--- a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java
+++ b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java
@@ -265,7 +265,9 @@ public class BubbleStackView extends FrameLayout {
      * Handle config changes.
      */
     public void onConfigChanged() {
-        mExpandedBubble.expandedView.updateHeaderColor();
+        if (mExpandedBubble != null) {
+            mExpandedBubble.expandedView.updateHeaderColor();
+        }
     }
 
     @Override