PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Hyunyoung Song
2020-06-20 06:27:01 +00:00
committed by Android (Google) Code Review
parent d4b946dbe3 5eae3c0a0a
commit ac3f71269e
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java
+9 -5
View File
@@ -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();
for (ItemInfo info : folderContents) {
LauncherAtom.ItemInfo atomInfo = info.buildProto(fInfo);
writeSnapshot(atomInfo, mInstanceId);
}
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);