Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7be25082 authored by Winson Chung's avatar Winson Chung Committed by android-build-merger
Browse files

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

am: b11ca32c

Change-Id: I52aa3ec9151d905008af771c77e7ba486cf870c8
parents b1369e26 b11ca32c

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

+3 −0
Original line number Diff line number Diff line
@@ -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();