summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2014-05-27 19:28:50 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-05-27 19:28:51 +0000
commit8804ce96b1ef3aa260076091e77abcce0b1ea1d9 (patch)
treed4a987423c2b4647b23e4ba73ef558fd1b2d8c56 /services
parent2ed67e6de7b2aefce82b2b10fc637dbc4e72773d (diff)
parent9693d9534342c9785877a9f98ec5aff6fd9ac496 (diff)
downloadframeworks_base-8804ce96b1ef3aa260076091e77abcce0b1ea1d9.zip
frameworks_base-8804ce96b1ef3aa260076091e77abcce0b1ea1d9.tar.gz
frameworks_base-8804ce96b1ef3aa260076091e77abcce0b1ea1d9.tar.bz2
Merge "Updating task description whenever we create a RecentTaskInfo. (Bug. 15195617)" into lmp-preview-dev
Diffstat (limited to 'services')
-rw-r--r--services/core/java/com/android/server/am/ActivityManagerService.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index 1755472..fc808ec 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -7085,6 +7085,10 @@ public final class ActivityManagerService extends ActivityManagerNative
* Creates a new RecentTaskInfo from a TaskRecord.
*/
private ActivityManager.RecentTaskInfo createRecentTaskInfoFromTaskRecord(TaskRecord tr) {
+ // Update the task description to reflect any changes in the task stack
+ tr.updateTaskDescription();
+
+ // Compose the recent task info
ActivityManager.RecentTaskInfo rti
= new ActivityManager.RecentTaskInfo();
rti.id = tr.mActivities.isEmpty() ? -1 : tr.taskId;