commit 59534c7a24bbe9b4edd28453e28cdeb015ed7de5
author Schneider Victor-tulias <victortulias@google.com> Wed Mar 09 18:13:18 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 09 18:13:18 2022 +0000
tree 729debb7a666668394e77e5aff393bdc2bd43cd8
parent a57dc7d4021dbf82daff55515a7ceeb60fe8140f
parent 64b3497301e049a0f9b4d4e513ad560f00beb239

Merge "Fixing crashloop where LauncherActivityInfo can be null during icon query." into tm-dev

src/com/android/launcher3/icons/IconCache.java

diff --git a/src/com/android/launcher3/icons/IconCache.java b/src/com/android/launcher3/icons/IconCache.java
index 308a8f2..5ece4a6 100644
--- a/src/com/android/launcher3/icons/IconCache.java
+++ b/src/com/android/launcher3/icons/IconCache.java
@@ -440,7 +440,7 @@
                             cn,
                             sectionKey.first);
                 }
-                if (loadFallbackTitle && TextUtils.isEmpty(entry.title)) {
+                if (loadFallbackTitle && TextUtils.isEmpty(entry.title) && lai != null) {
                     loadFallbackTitle(
                             lai,
                             entry,