Merge "Protect against NPE" into rvc-dev am: 7f572a5a76

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11842994 Change-Id: I70b3d6d3850c4f12a85ba5be6d6c35b19069b5c9
2020-06-12 01:24:00 +00:00
parent a940158cdd 7f572a5a76
commit 61367d73a7
1 changed files with 3 additions and 0 deletions
--- a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java
+++ b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java
@@ -1780,6 +1780,9 @@ public class BubbleStackView extends FrameLayout
                        AnimatableScaleMatrix.getAnimatableValueForScaleFactor(1f),
                        mScaleInSpringConfig)
                .addUpdateListener((target, values) -> {
+                    if (mExpandedBubble.getIconView() == null) {
+                        return;
+                    }
                    mExpandedViewContainerMatrix.postTranslate(
                            mExpandedBubble.getIconView().getTranslationX()
                                    - bubbleWillBeAtX,