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

Commit cd9967a8 authored by Will Osborn's avatar Will Osborn
Browse files

Allow overriding of displayId on Task.TaskKey 

Test: launch apps on VDM display from VDM host (use ./development/samples/VirtualDeviceManager/setup.sh -s and 'single device mode' in settings)
Test: open Overview
Test: change policy in VDM host settings and observe tasks on default display
Flag: EXEMPT bugfix
Bug: 437848012

Change-Id: I40f40eb54d7fdb13254161f96f0f65c83dd144c9
parent 23aaf018

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;