| commit | eaacedad922063a2b407a26c58afd505a7662698 | [log] [tgz] |
|---|---|---|
| author | Jonathan Miranda <jonmiranda@google.com> | Tue Nov 30 19:07:04 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Nov 30 19:07:04 2021 +0000 |
| tree | 08a4a4ac99d58a349a81e4d92e0897147a775b6c | |
| parent | 41e7174cb816b0d9fe46a891aa68781cf72426af [diff] | |
| parent | b32723a073904945c01daad7ca0f05553e18db44 [diff] |
Merge "Fix NPE in FloatingIconView" into sc-v2-dev am: 199644c397 am: b32723a073 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16307843 Change-Id: Ia7042e276a46cf0585376e36ac62d5f53ef5bd6f
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); }