commit b8337e9e1253d2ee6a78153b9f2b98ea195c6b33
author Andrew Chant <achant@google.com> Thu Apr 18 23:14:57 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 18 23:14:57 2019 +0000
tree 923b31aa70707044596bc198cab45b723ae31b70
parent 7fdbe22475f00a2f69c63e0647c342f49681d07d
parent 4071ddb47c1ba80dd9f64ba9279866c292be1d91

Merge "Fix crash." into qt-dev

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

diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java
index b755f28..9d9c88f 100644
--- a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java
+++ b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java
@@ -542,6 +542,9 @@
      * status bar, otherwise returns {@link Display#INVALID_DISPLAY}.
      */
     public int getExpandedDisplayId(Context context) {
+        if (mStackView == null) {
+            return INVALID_DISPLAY;
+        }
         boolean defaultDisplay = context.getDisplay() != null
                 && context.getDisplay().getDisplayId() == DEFAULT_DISPLAY;
         Bubble b = mStackView.getExpandedBubble();