Merge "Fix possible NPE" into rvc-dev

2020-06-24 03:48:07 +00:00
parent 8655743001 e1ee90edbf
commit c3260a4c39
1 changed files with 1 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java
+++ b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java
@@ -1904,7 +1904,7 @@ public class BubbleStackView extends FrameLayout
                            AnimatableScaleMatrix.getAnimatableValueForScaleFactor(1f),
                            mScaleInSpringConfig)
                    .addUpdateListener((target, values) -> {
-                        if (mExpandedBubble.getIconView() == null) {
+                        if (mExpandedBubble == null || mExpandedBubble.getIconView() == null) {
                            return;
                        }
                        mExpandedViewContainerMatrix.postTranslate(