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

am: d17d5a487d Change-Id: Ib135f9d0c3a5ccf3aace66996659264d99dc71ab
2018-05-31 20:11:17 -07:00
parent 2ea7cf2299 d17d5a487d
commit b11ca32c54
1 changed files with 3 additions and 0 deletions
--- a/services/core/java/com/android/server/am/TaskRecord.java
+++ b/services/core/java/com/android/server/am/TaskRecord.java
@@ -1606,6 +1606,9 @@ class TaskRecord extends ConfigurationContainer implements TaskWindowContainerLi
            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();