Merge "Fix possible NPE" into sc-v2-dev am: a7efb5e025

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15881361

Change-Id: Ie925e9f81a441c48055876b67046d6bc19301952
This commit is contained in:
Mady Mellor
2021-09-23 14:52:16 +00:00
committed by Automerger Merge Worker

View File

@@ -968,7 +968,7 @@ public class BubbleStackView extends FrameLayout
} }
}); });
mExpandedViewAlphaAnimator.addUpdateListener(valueAnimator -> { mExpandedViewAlphaAnimator.addUpdateListener(valueAnimator -> {
if (mExpandedBubble != null) { if (mExpandedBubble != null && mExpandedBubble.getExpandedView() != null) {
mExpandedBubble.getExpandedView().setTaskViewAlpha( mExpandedBubble.getExpandedView().setTaskViewAlpha(
(float) valueAnimator.getAnimatedValue()); (float) valueAnimator.getAnimatedValue());
} }