commit 7f572a5a76cc6b182bbbd0e414b352dc88358b7a
author Lyn Han <lynhan@google.com> Fri Jun 12 01:11:35 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 12 01:11:35 2020 +0000
tree 731875c6aac555a131a56e141546483540f9c3ca
parent 4e86ccd2e6419f92486e3cde0745e61902d37087
parent bcac9410b5aa2e940264d7b8e0d56d9df07b2186

Merge "Protect against NPE" into rvc-dev

packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java

diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java
index 088747b..976fc3a 100644
--- a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java
+++ b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java
@@ -1780,6 +1780,9 @@
                         AnimatableScaleMatrix.getAnimatableValueForScaleFactor(1f),
                         mScaleInSpringConfig)
                 .addUpdateListener((target, values) -> {
+                    if (mExpandedBubble.getIconView() == null) {
+                        return;
+                    }
                     mExpandedViewContainerMatrix.postTranslate(
                             mExpandedBubble.getIconView().getTranslationX()
                                     - bubbleWillBeAtX,