Merge "Be super safe" into rvc-dev am: f664b6d0d9 am: 9ad149eb5a

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11872633 Change-Id: Ib65e8f597f84daf271e9d145a5c0132fb56b5e48
2020-06-15 22:35:16 +00:00
parent e9a2430284 9ad149eb5a
commit bb423fee7a
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();
    }