commit b11ca32c54bf06dbae66627832d5325e7da44539
author Winson Chung <winsonc@google.com> Thu May 31 20:11:17 2018 -0700
committer android-build-merger <android-build-merger@google.com> Thu May 31 20:11:17 2018 -0700
tree 693067b107974da6f1964de4f2e4df841de10383
parent 2ea7cf22998b9437c5e215b40d31f4df81a75819
parent d17d5a487d541b32394b71af77d255c2a80f5c8a

Merge "Skip task overlay in calcuating task description" into pi-dev
am: d17d5a487d

Change-Id: Ib135f9d0c3a5ccf3aace66996659264d99dc71ab

services/core/java/com/android/server/am/TaskRecord.java

diff --git a/services/core/java/com/android/server/am/TaskRecord.java b/services/core/java/com/android/server/am/TaskRecord.java
index 9a5b1a6..d3ac7cb 100644
--- a/services/core/java/com/android/server/am/TaskRecord.java
+++ b/services/core/java/com/android/server/am/TaskRecord.java
@@ -1606,6 +1606,9 @@
             boolean topActivity = true;
             for (--activityNdx; activityNdx >= 0; --activityNdx) {
                 final ActivityRecord r = mActivities.get(activityNdx);
+                if (r.mTaskOverlay) {
+                    continue;
+                }
                 if (r.taskDescription != null) {
                     if (label == null) {
                         label = r.taskDescription.getLabel();