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

Commit 4e36f5a6 authored by Will Osborn's avatar Will Osborn Committed by Android (Google) Code Review
Browse files

Merge "Allow overriding of displayId on Task.TaskKey" into main

parents 193afd3d cd9967a8

packages/SystemUI/shared/src/com/android/systemui/shared/recents/model/Task.java

+4 −1
Original line number Original line Diff line number Diff line
@@ -107,6 +107,9 @@ public class Task { 
        private int mHashCode;

        private int mHashCode;





        public TaskKey(TaskInfo t) {

        public TaskKey(TaskInfo t) {

            this(t, t.displayId);

        }

        public TaskKey(TaskInfo t, int displayIdOverride) {

            ComponentName sourceComponent = t.origActivity != null

            ComponentName sourceComponent = t.origActivity != null

                    // Activity alias if there is one

                    // Activity alias if there is one

                    ? t.origActivity

                    ? t.origActivity
@@ -118,7 +121,7 @@ public class Task { 
            this.sourceComponent = sourceComponent;

            this.sourceComponent = sourceComponent;

            this.userId = t.userId;

            this.userId = t.userId;

            this.lastActiveTime = t.lastActiveTime;

            this.lastActiveTime = t.lastActiveTime;

            this.displayId = t.displayId;

            this.displayId = displayIdOverride;

            this.baseActivity = t.baseActivity;

            this.baseActivity = t.baseActivity;

            this.numActivities = t.numActivities;

            this.numActivities = t.numActivities;

            this.isTopActivityNoDisplay = t.isTopActivityNoDisplay;

            this.isTopActivityNoDisplay = t.isTopActivityNoDisplay;