commit c1639e978b052d90d66919b55ada88153f1ee822
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Jun 18 04:44:38 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jun 18 04:44:38 2020 +0000
tree eeea92346903c5bad03cd49efe37b801f842b7c9
parent a74dac65a499d1d06a6d5ad5419d0574c0aee367
parent 9c126682d7fd71bde27ab7ac1ee998dfcee6fb51

Merge "Snapshot logging only use cloned model thread folder contents Bug: 158826147" into ub-launcher3-rvc-dev am: 9c126682d7

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

Change-Id: I7e35babd5a8d86e9faca238143b9ebf61101c36b

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

diff --git a/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java b/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java
index 0863aa2..54894f0 100644
--- a/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java
+++ b/quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java
@@ -41,6 +41,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.IntSparseArrayMap;
 import com.android.launcher3.util.LogConfig;
 import com.android.systemui.shared.system.SysUiStatsLog;
@@ -192,7 +193,8 @@
                 writeSnapshot(atomInfo, mInstanceId);
             }
             for (FolderInfo fInfo : folders) {
-                for (ItemInfo info : fInfo.contents) {
+                ArrayList<WorkspaceItemInfo> folderContents = (ArrayList) fInfo.contents.clone();
+                for (ItemInfo info : folderContents) {
                     LauncherAtom.ItemInfo atomInfo = info.buildProto(fInfo);
                     writeSnapshot(atomInfo, mInstanceId);
                 }