commit 24184fa7cd75bd46ae8a8608daf06c259b7dcb44
author Fengjiang Li <fengjial@google.com> Mon Aug 12 11:49:19 2024 -0700
committer Fengjiang Li <fengjial@google.com> Mon Aug 12 11:49:19 2024 -0700
tree 2c644491a286ae0b6cd638f13202b6f339e8fa06
parent fee62395a263769198fafa329bdcbceffd8cfa12

[NPE] Skip all apps icon preinflatioino on bg thread if layout manager is set to null

Fix: 355192472
Test: presubmit
Flag: NONE - bug fix
Change-Id: Icdac63c58983cd7bada5d75f0e257d45d48a8d2e

src/com/android/launcher3/recyclerview/AllAppsRecyclerViewPool.kt

diff --git a/src/com/android/launcher3/recyclerview/AllAppsRecyclerViewPool.kt b/src/com/android/launcher3/recyclerview/AllAppsRecyclerViewPool.kt
index e317824..6ff51ca 100644
--- a/src/com/android/launcher3/recyclerview/AllAppsRecyclerViewPool.kt
+++ b/src/com/android/launcher3/recyclerview/AllAppsRecyclerViewPool.kt
@@ -108,6 +108,11 @@
                         if (task?.canceled == true) {
                             break
                         }
+                        // If activeRv's layout manager has been reset to null on main thread, skip
+                        // the preinflation as we cannot generate correct LayoutParams
+                        if (activeRv.layoutManager == null) {
+                            break
+                        }
                         list.add(
                             adapter.createViewHolder(activeRv, BaseAllAppsAdapter.VIEW_TYPE_ICON)
                         )