Merge "Make sure we have an expanded bubble in onConfigChange"

1 files changed, 3 insertions, 1 deletions

diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java
index 580acb82ebc1..c9228de5802a 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