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: I23cdcb250747da181607bebe151b31b325764141
2021-03-25 21:37:45 +00:00
parent d52247907f fe158fab89
commit 14eab916cb
1 changed files with 2 additions and 0 deletions
@@ -40,6 +40,7 @@ import java.util.Collections;
 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 @@ public class PopupDataProvider implements NotificationListener.NotificationsChan
                .map(recommendedWidget -> allWidgetItems.get(
                        new ComponentKey(recommendedWidget.getTargetComponent(),
                                recommendedWidget.user)))
+                .filter(Objects::nonNull)
                .collect(Collectors.toList());
    }