Merge "Be super safe" into rvc-dev

2020-06-15 22:09:47 +00:00
parent 97d794084d 9ec5226416
commit f664b6d0d9
1 changed files with 3 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java
+++ b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java
@@ -1905,7 +1905,9 @@ public class BubbleStackView extends FrameLayout
                    updateOverflowVisibility();

                    afterExpandedViewAnimation();
-                    previouslySelected.setContentVisibility(false);
+                    if (previouslySelected != null) {
+                        previouslySelected.setContentVisibility(false);
+                    }
                })
                .start();
    }