Merge "Copy collections to avoid concurrent crash"

2018-06-26 01:03:56 +00:00
parent ee44571c34 2b78b1ffa5
commit 05e554dbc4
1 changed files with 3 additions and 2 deletions
--- 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.File;
 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 @@ class TaskSnapshotPersister {
        @VisibleForTesting
        RemoveObsoleteFilesQueueItem(ArraySet<Integer> persistentTaskIds,
                int[] runningUserIds) {
-            mPersistentTaskIds = persistentTaskIds;
-            mRunningUserIds = runningUserIds;
+            mPersistentTaskIds = new ArraySet<>(persistentTaskIds);
+            mRunningUserIds = Arrays.copyOf(runningUserIds, runningUserIds.length);
        }

        @Override