diff options
author | Pinyao Ting <pinyaoting@google.com> | 2019-09-16 13:11:45 -0700 |
---|---|---|
committer | Pinyao Ting <pinyaoting@google.com> | 2019-09-16 20:38:44 +0000 |
commit | cfbeab15f5379a203cbab5afbf056870d262553f (patch) | |
tree | 5a751f69e3bcefa0b4dcb480b0a9fea5472b1a4d /iconloaderlib | |
parent | d13f0c5c45550bffc335f47f1a0c545df68c0584 (diff) | |
download | android_packages_apps_Trebuchet-cfbeab15f5379a203cbab5afbf056870d262553f.tar.gz android_packages_apps_Trebuchet-cfbeab15f5379a203cbab5afbf056870d262553f.tar.bz2 android_packages_apps_Trebuchet-cfbeab15f5379a203cbab5afbf056870d262553f.zip |
fix the issue update handler tries to cache a shortcut without valid
bitmap.
Change-Id: Ie400fdb811928015903319eed69879de1728539a
Diffstat (limited to 'iconloaderlib')
-rw-r--r-- | iconloaderlib/src/com/android/launcher3/icons/cache/BaseIconCache.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/iconloaderlib/src/com/android/launcher3/icons/cache/BaseIconCache.java b/iconloaderlib/src/com/android/launcher3/icons/cache/BaseIconCache.java index 36d1c3ecc..c100f0596 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 @@ public abstract class BaseIconCache { 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); |