commit 2b78b1ffa5616a3feba5a0442aa2ea8dc7e4f8c9
author Jorim Jaggi <jjaggi@google.com> Mon Jun 18 15:48:06 2018 +0200
committer Jorim Jaggi <jjaggi@google.com> Mon Jun 25 16:26:36 2018 +0000
tree 002307547fdb0817817f88d4115e8be50371c5cf
parent 6d5bdf293d399d9986179ae0987e4e058a27e324

Copy collections to avoid concurrent crash

Test: TaskSnapshotPersisterTest:
Change-Id: If3ac8b565a3f92600374c9330e9927a50c6f871a
Fixes: 110074872

services/core/java/com/android/server/wm/TaskSnapshotPersister.java

diff --git a/services/core/java/com/android/server/wm/TaskSnapshotPersister.java b/services/core/java/com/android/server/wm/TaskSnapshotPersister.java
index a642e6a..21e807e 100644
--- a/services/core/java/com/android/server/wm/TaskSnapshotPersister.java
+++ b/services/core/java/com/android/server/wm/TaskSnapshotPersister.java
@@ -39,6 +39,7 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.ArrayDeque;
+import java.util.Arrays;
 
 /**
  * Persists {@link TaskSnapshot}s to disk.
@@ -399,8 +400,8 @@
         @VisibleForTesting
         RemoveObsoleteFilesQueueItem(ArraySet<Integer> persistentTaskIds,
                 int[] runningUserIds) {
-            mPersistentTaskIds = persistentTaskIds;
-            mRunningUserIds = runningUserIds;
+            mPersistentTaskIds = new ArraySet<>(persistentTaskIds);
+            mRunningUserIds = Arrays.copyOf(runningUserIds, runningUserIds.length);
         }
 
         @Override