Merge "Fix ConcurrentModificationException in QuickstepWidgetHolder" into udc-dev am: 8f85ad38ba am: 595c1e44a1 am: 439ccd215b

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22934145 Change-Id: I77a11f2bc2570330ffcde03a6030b5652b56eaf1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 23:09:45 +00:00
parent 977ab859a8 439ccd215b
commit 2ef79458f1
1 changed files with 5 additions and 1 deletions
@@ -95,7 +95,11 @@ public final class QuickstepWidgetHolder extends LauncherWidgetHolder {
                    i -> MAIN_EXECUTOR.execute(() ->
                            sHolders.forEach(h -> h.mAppWidgetRemovedCallback.accept(i))),
                    () -> MAIN_EXECUTOR.execute(() ->
-                            sHolders.forEach(h -> h.mProviderChangedListeners.forEach(
+                            sHolders.forEach(h ->
+                                    // Listeners might remove themselves from the list during the
+                                    // iteration. Creating a copy of the list to avoid exceptions
+                                    // for concurrent modification.
+                                    new ArrayList<>(h.mProviderChangedListeners).forEach(
                                    ProviderChangedListener::notifyWidgetProvidersChanged))),
                    UI_HELPER_EXECUTOR.getLooper());
            if (!WidgetsModel.GO_DISABLE_WIDGETS) {