Merge "Fix possible NPE" into rvc-dev am: c3260a4c39

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

Change-Id: I86373c421850f03ae9f252b25ba1a049afea27af
This commit is contained in:
TreeHugger Robot
2020-06-24 03:50:54 +00:00
committed by Automerger Merge Worker

View File

@@ -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(