commit 199644c397ba01b5d8728a781d47552c3f053670
author Jonathan Miranda <jonmiranda@google.com> Tue Nov 30 18:43:29 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Nov 30 18:43:29 2021 +0000
tree fffeaa4ac0f55d6055642c5d811c4b83ab02d6b0
parent 96f34af1240e1bc44036ea2c05b51db8aae87923
parent 73a7e1ce4172acb3a244249d10d5cb1e0c514a1c

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

src/com/android/launcher3/views/FloatingIconView.java

diff --git a/src/com/android/launcher3/views/FloatingIconView.java b/src/com/android/launcher3/views/FloatingIconView.java
index 8b7ad46..27cf134 100644
--- a/src/com/android/launcher3/views/FloatingIconView.java
+++ b/src/com/android/launcher3/views/FloatingIconView.java
@@ -460,7 +460,7 @@
         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);
         }