commit cfbeab15f5379a203cbab5afbf056870d262553f
author Pinyao Ting <pinyaoting@google.com> Mon Sep 16 13:11:45 2019 -0700
committer Pinyao Ting <pinyaoting@google.com> Mon Sep 16 20:38:44 2019 +0000
tree 5a751f69e3bcefa0b4dcb480b0a9fea5472b1a4d
parent d13f0c5c45550bffc335f47f1a0c545df68c0584

fix the issue update handler tries to cache a shortcut without valid
bitmap.

Change-Id: Ie400fdb811928015903319eed69879de1728539a

iconloaderlib/src/com/android/launcher3/icons/cache/BaseIconCache.java

diff --git a/iconloaderlib/src/com/android/launcher3/icons/cache/BaseIconCache.java b/iconloaderlib/src/com/android/launcher3/icons/cache/BaseIconCache.java
index 36d1c3e..c100f05 100644
--- a/iconloaderlib/src/com/android/launcher3/icons/cache/BaseIconCache.java
+++ b/iconloaderlib/src/com/android/launcher3/icons/cache/BaseIconCache.java
@@ -267,6 +267,10 @@
             entry = new CacheEntry();
             cachingLogic.loadIcon(mContext, object, entry);
         }
+        // Icon can't be loaded from cachingLogic, which implies alternative icon was loaded
+        // (e.g. fallback icon, default icon). So we drop here since there's no point in caching
+        // an empty entry.
+        if (entry.icon == null) return;
         entry.title = cachingLogic.getLabel(object);
         entry.contentDescription = mPackageManager.getUserBadgedLabel(entry.title, user);
         mCache.put(key, entry);