From 64b3497301e049a0f9b4d4e513ad560f00beb239 Mon Sep 17 00:00:00 2001
From: Schneider Victor-tulias <victortulias@google.com>
Date: Mon, 7 Mar 2022 12:46:36 -0800
Subject: [PATCH] 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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