commit fe158fab892fc8f8ff6dd21f427e5923c727f098
author Steven Ng <stevenckng@google.com> Thu Mar 25 20:54:38 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 25 20:54:38 2021 +0000
tree 440a67303c9400c3753328dae545f28546e14194
parent 0a74a35a419bd68903f2068b047de2188f00b370
parent 074f83205d6022c1f6593921575108e5c8d3de24

Merge "Filter out potential null widget item from recommended widgets" into sc-dev

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());
     }