commit 4071ddb47c1ba80dd9f64ba9279866c292be1d91
author Joel Galenson <jgalenson@google.com> Thu Apr 18 13:30:45 2019 -0700
committer Mady Mellor <madym@google.com> Thu Apr 18 20:34:45 2019 +0000
tree 5a52fb0ddf9292c11242234330ace5ac3cd96a71
parent 6c4094c67da5e8ed7549e88d57d6c74d3f71a316

Fix crash.

Fix a SysUI NullPointerException.

Bug: 130821357
Test: atest BubbleControllerTest KeyButtonViewTest
Change-Id: I56923480bd2c3441cd9328e52b4b5bd35d676dc2

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();