Merge "Merge "Fix possible NPE" into rvc-dev am: c3260a4c39 am: f4962c4443" into rvc-d1-dev-plus-aosp

This commit is contained in:
Automerger Merge Worker
2020-06-24 03:51:29 +00:00
committed by Android (Google) Code Review

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(