commit 074f83205d6022c1f6593921575108e5c8d3de24
author Steven Ng <stevenckng@google.com> Thu Mar 25 16:51:54 2021 +0000
committer Steven Ng <stevenckng@google.com> Thu Mar 25 17:01:13 2021 +0000
tree c65d7766e80a237b08d3cc7cf4ff1c1a8b61ef20
parent 59230c3cdd143cb5f992a5a5076e38ca74ac9e7a

Filter out potential null widget item from recommended widgets

There is a likely a race condition which the recommended widgets
contain widget that have not been added to mAllWidgets. Instead
of introducing a lock mechanism, let's simply filter null widgets.

Test: manual

Bug: 183619699
Change-Id: Ia82778b8ac8c42265bdf6838e059f81022a0d4ef

src/com/android/launcher3/popup/PopupDataProvider.java

diff --git a/src/com/android/launcher3/popup/PopupDataProvider.java b/src/com/android/launcher3/popup/PopupDataProvider.java
index 7780894..6f9f0d7 100644
--- a/src/com/android/launcher3/popup/PopupDataProvider.java
+++ b/src/com/android/launcher3/popup/PopupDataProvider.java
@@ -40,6 +40,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
@@ -224,6 +225,7 @@
                 .map(recommendedWidget -> allWidgetItems.get(
                         new ComponentKey(recommendedWidget.getTargetComponent(),
                                 recommendedWidget.user)))
+                .filter(Objects::nonNull)
                 .collect(Collectors.toList());
     }