Merge "Fix crash." into qt-dev

2019-04-18 23:14:57 +00:00
parent 7fdbe22475 4071ddb47c
commit b8337e9e12
1 changed files with 3 additions and 0 deletions
--- a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java
+++ b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java
@@ -542,6 +542,9 @@ public class BubbleController implements ConfigurationController.ConfigurationLi
     * 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();