From 73a7e1ce4172acb3a244249d10d5cb1e0c514a1c Mon Sep 17 00:00:00 2001
From: Jon Miranda <jonmiranda@google.com>
Date: Fri, 19 Nov 2021 13:40:59 -0800
Subject: [PATCH] Fix NPE in FloatingIconView

Happens when view is reset before animation starts

Bug: 201946253
Test: manual
Change-Id: I62817f698996dc1c6bebcd038d01eb8d6923a305
---
 src/com/android/launcher3/views/FloatingIconView.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/launcher3/views/FloatingIconView.java b/src/com/android/launcher3/views/FloatingIconView.java
index 8b7ad46dfb..27cf134feb 100644
--- a/src/com/android/launcher3/views/FloatingIconView.java
+++ b/src/com/android/launcher3/views/FloatingIconView.java
@@ -460,7 +460,7 @@ public class FloatingIconView extends FrameLayout implements
         if (mIconLoadResult != null && mIconLoadResult.isIconLoaded) {
             setVisibility(View.VISIBLE);
         }
-        if (!mIsOpening) {
+        if (!mIsOpening && mOriginalIcon != null) {
             // When closing an app, we want the item on the workspace to be invisible immediately
             setIconAndDotVisible(mOriginalIcon, false);
         }