commit 64b3497301e049a0f9b4d4e513ad560f00beb239
author Schneider Victor-tulias <victortulias@google.com> Mon Mar 07 12:46:36 2022 -0800
committer Schneider Victor-tulias <victortulias@google.com> Mon Mar 07 23:22:29 2022 +0000
tree 2c81ab7409a3c2a93181877913068a62babf3997
parent 90f9499735c04adbb168c4dfd36e22269d87ac8a

Fixing crashloop where LauncherActivityInfo can be null during icon query.

The previous icon loading path checked that the LauncherActivityInfo was not null and did nothing otherwise. Updating bulk icon loading path to do the same.

Fixes: 223219500
Test: manual
Change-Id: I79b7f15c65183f42ed6a23fec05558c250150cb6

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,