| commit | 73a7e1ce4172acb3a244249d10d5cb1e0c514a1c | [log] [tgz] |
|---|---|---|
| author | Jon Miranda <jonmiranda@google.com> | Fri Nov 19 13:40:59 2021 -0800 |
| committer | Jon Miranda <jonmiranda@google.com> | Fri Nov 19 13:40:59 2021 -0800 |
| tree | 46577855542fcea091bd6f5fda536716af817fe9 | |
| parent | b797ca77b22fabb88375aba330bf87ab770b00e7 [diff] |
Fix NPE in FloatingIconView Happens when view is reset before animation starts Bug: 201946253 Test: manual Change-Id: I62817f698996dc1c6bebcd038d01eb8d6923a305
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); }