commit d8bef18e1c4a8433dac615a8b4d63f95703ebd74
author TreeHugger Robot <treehugger-gerrit@google.com> Sun Feb 02 16:32:18 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sun Feb 02 16:32:18 2020 +0000
tree 049be849cf4d467c68d0ef9e45a00e79f4ec3a44
parent 1320c7b7074f87a8371bdabac682f0e48c620e30
parent c5a1bd429ecaf6dc11c5d76d642f77beac265b14

Merge "Make a copy of base intent for task info"

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

diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java
index 271f559..28dc2a4 100644
--- a/services/core/java/com/android/server/wm/Task.java
+++ b/services/core/java/com/android/server/wm/Task.java
@@ -3215,7 +3215,9 @@
         info.displayId = getDisplayId();
         info.isRunning = getTopNonFinishingActivity() != null;
         final Intent baseIntent = getBaseIntent();
-        info.baseIntent = baseIntent == null ? new Intent() : baseIntent;
+        // Make a copy of base intent because this is like a snapshot info.
+        // Besides, {@link RecentTasks#getRecentTasksImpl} may modify it.
+        info.baseIntent = baseIntent == null ? new Intent() : new Intent(baseIntent);
         info.baseActivity = mReuseActivitiesReport.base != null
                 ? mReuseActivitiesReport.base.intent.getComponent()
                 : null;