Merge "Fix possible NPE" into sc-v2-dev

2021-09-23 14:40:12 +00:00
parent a1b54abe38 120e6068e2
commit a7efb5e025
1 changed files with 1 additions and 1 deletions
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleStackView.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleStackView.java
@@ -968,7 +968,7 @@ public class BubbleStackView extends FrameLayout
            }
        });
        mExpandedViewAlphaAnimator.addUpdateListener(valueAnimator -> {
-            if (mExpandedBubble != null) {
+            if (mExpandedBubble != null && mExpandedBubble.getExpandedView() != null) {
                mExpandedBubble.getExpandedView().setTaskViewAlpha(
                        (float) valueAnimator.getAnimatedValue());
            }