commit e1ccc5c273c28f31d757487877135182d0415954
author Steven Ng <stevenckng@google.com> Thu Mar 25 21:35:51 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Mar 25 21:35:51 2021 +0000
tree 440a67303c9400c3753328dae545f28546e14194
parent cfd17e2a23f20ad647b7564a95fb50dfe2991719
parent fe158fab892fc8f8ff6dd21f427e5923c727f098

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/13989192

Change-Id: I9c5a139fc53c736df27d361dcbc4aea51c0b8c74

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