| commit | f2a8ead524506d31eb76a7a3f01b866c8bcb9a27 | [log] [tgz] |
|---|---|---|
| author | Samuel Fufa <sfufa@google.com> | Mon Sep 20 21:38:05 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 20 21:38:05 2021 +0000 |
| tree | 1df53b57ec4786bee18db90f63132ed62087cf11 | |
| parent | 8ab7a2eb28a18bfc67ca47b57c3821ce05bf3249 [diff] | |
| parent | 700858930ddd6704541e3a1df34ca75f07ce1bd2 [diff] |
Merge "[AllApps] Fix ConcurrentModificationException in AppPredictionRow" into sc-v2-dev am: 7f693253c8 am: 700858930d Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15862035 Change-Id: I34420cc5c0d4a1ac6cd5037b50e915ea1f5bf44a
diff --git a/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java b/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java index 6afbf9a..5242b3c 100644 --- a/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java +++ b/quickstep/src/com/android/launcher3/appprediction/PredictionRowView.java
@@ -48,6 +48,7 @@ import java.util.ArrayList; import java.util.List; +import java.util.stream.Collectors; @TargetApi(Build.VERSION_CODES.P) public class PredictionRowView extends LinearLayout implements @@ -170,10 +171,9 @@ private void applyPredictedApps(List<ItemInfo> items) { mPendingPredictedItems = null; mPredictedApps.clear(); - items.stream() + mPredictedApps.addAll(items.stream() .filter(itemInfo -> itemInfo instanceof WorkspaceItemInfo) - .map(itemInfo -> (WorkspaceItemInfo) itemInfo) - .forEach(mPredictedApps::add); + .map(itemInfo -> (WorkspaceItemInfo) itemInfo).collect(Collectors.toList())); applyPredictionApps(); }