From 8d9009e12921b7eb48adb021100d925f96f409b7 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Thu, 16 Nov 2017 15:43:05 -0800
Subject: [PATCH] Only update the task description when the task/description
 changes

- Instead of updating again for every task when we fetch recents, only update
  when the activities change

Bug: 69166452
Test: android.app.cts.TaskDescriptionTest
Change-Id: Idb66ee4c3ca6f637b6ab52c6d52dd1a09926c48f
---
 services/core/java/com/android/server/am/RecentTasks.java | 3 ---
 services/core/java/com/android/server/am/TaskRecord.java  | 3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/services/core/java/com/android/server/am/RecentTasks.java b/services/core/java/com/android/server/am/RecentTasks.java
index d35c37b54431..c742f6855180 100644
--- a/services/core/java/com/android/server/am/RecentTasks.java
+++ b/services/core/java/com/android/server/am/RecentTasks.java
@@ -1426,9 +1426,6 @@ class RecentTasks {
      * Creates a new RecentTaskInfo from a TaskRecord.
      */
     ActivityManager.RecentTaskInfo createRecentTaskInfo(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.getTopActivity() == null ? INVALID_TASK_ID : tr.taskId;
diff --git a/services/core/java/com/android/server/am/TaskRecord.java b/services/core/java/com/android/server/am/TaskRecord.java
index 949f51fe1b09..290bebf981d7 100644
--- a/services/core/java/com/android/server/am/TaskRecord.java
+++ b/services/core/java/com/android/server/am/TaskRecord.java
@@ -1616,6 +1616,9 @@ class TaskRecord extends ConfigurationContainer implements TaskWindowContainerLi
         final int effectiveRootIndex = findEffectiveRootIndex();
         final ActivityRecord r = mActivities.get(effectiveRootIndex);
         setIntent(r);
+
+        // Update the task description when the activities change
+        updateTaskDescription();
     }
 
     void saveToXml(XmlSerializer out) throws IOException, XmlPullParserException {