Merge "Fix NPE in FloatingIconView" into sc-v2-dev

This commit is contained in:
Jonathan Miranda 2021-11-30 18:43:29 +00:00 committed by Android (Google) Code Review
commit 199644c397
1 changed files with 1 additions and 1 deletions

View File

@ -460,7 +460,7 @@ public class FloatingIconView extends FrameLayout implements
if (mIconLoadResult != null && mIconLoadResult.isIconLoaded) { if (mIconLoadResult != null && mIconLoadResult.isIconLoaded) {
setVisibility(View.VISIBLE); setVisibility(View.VISIBLE);
} }
if (!mIsOpening) { if (!mIsOpening && mOriginalIcon != null) {
// When closing an app, we want the item on the workspace to be invisible immediately // When closing an app, we want the item on the workspace to be invisible immediately
setIconAndDotVisible(mOriginalIcon, false); setIconAndDotVisible(mOriginalIcon, false);
} }