Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ac3f7126 authored by Hyunyoung Song's avatar Hyunyoung Song Committed by Android (Google) Code Review
Browse files

Merge "Remove ConcurrentModificationException for snapshot logging Bug:... 

Merge "Remove ConcurrentModificationException for snapshot logging Bug: 159282737" into ub-launcher3-rvc-dev
parents d4b946db 5eae3c0a

quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java

+9 −5
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ import com.android.launcher3.model.data.FolderInfo; 
import com.android.launcher3.model.data.ItemInfo;

import com.android.launcher3.model.data.LauncherAppWidgetInfo;

import com.android.launcher3.model.data.WorkspaceItemInfo;

import com.android.launcher3.util.Executors;

import com.android.launcher3.util.IntSparseArrayMap;

import com.android.launcher3.util.LogConfig;

import com.android.systemui.shared.system.SysUiStatsLog;
@@ -124,11 +125,14 @@ public class StatsLogCompatManager extends StatsLogManager { 
                writeSnapshot(atomInfo, mInstanceId);

            }

            for (FolderInfo fInfo : folders) {

                ArrayList<WorkspaceItemInfo> folderContents = (ArrayList) fInfo.contents.clone();

                try {

                    ArrayList<WorkspaceItemInfo> folderContents =

                            (ArrayList) Executors.MAIN_EXECUTOR.submit(fInfo.contents::clone).get();

                    for (ItemInfo info : folderContents) {

                        LauncherAtom.ItemInfo atomInfo = info.buildProto(fInfo);

                        writeSnapshot(atomInfo, mInstanceId);

                    }

                } catch (Exception e) { }

            }

            for (ItemInfo info : appWidgets) {

                LauncherAtom.ItemInfo atomInfo = info.buildProto(null);