summaryrefslogtreecommitdiff
path: root/core/java/android/app/TaskInfo.java
diff options
context:
space:
mode:
authorMark Renouf <mrenouf@google.com>2019-02-08 13:51:41 -0500
committerMark Renouf <mrenouf@google.com>2019-02-11 12:13:11 -0500
commitb1abb5550da3e738e2ab5b02573f78231487d8d7 (patch)
treead6c5124caade5818e3c503a081387a3baf03af5 /core/java/android/app/TaskInfo.java
parent0d4bc92b47d3422442e469063d4502cc0206ace0 (diff)
Adds displayId to android.app.TaskInfo
Bug: 124058588 Test: atest WmTests:TaskStackChangedListenerTest Change-Id: Ie79a67d3f112be34cdb78fbdb70fd609fd92982a
Diffstat (limited to 'core/java/android/app/TaskInfo.java')
-rw-r--r--core/java/android/app/TaskInfo.java9
1 files changed, 9 insertions, 0 deletions
diff --git a/core/java/android/app/TaskInfo.java b/core/java/android/app/TaskInfo.java
index 077b177be930..dd00e5a74382 100644
--- a/core/java/android/app/TaskInfo.java
+++ b/core/java/android/app/TaskInfo.java
@@ -97,6 +97,12 @@ public class TaskInfo {
public long lastActiveTime;
/**
+ * The id of the display this task is associated with.
+ * @hide
+ */
+ public int displayId;
+
+ /**
* The recent activity values for the highest activity in the stack to have set the values.
* {@link Activity#setTaskDescription(android.app.ActivityManager.TaskDescription)}.
*/
@@ -152,6 +158,7 @@ public class TaskInfo {
userId = source.readInt();
stackId = source.readInt();
taskId = source.readInt();
+ displayId = source.readInt();
isRunning = source.readBoolean();
baseIntent = source.readInt() != 0
? Intent.CREATOR.createFromParcel(source)
@@ -179,6 +186,7 @@ public class TaskInfo {
dest.writeInt(userId);
dest.writeInt(stackId);
dest.writeInt(taskId);
+ dest.writeInt(displayId);
dest.writeBoolean(isRunning);
if (baseIntent != null) {
@@ -209,6 +217,7 @@ public class TaskInfo {
@Override
public String toString() {
return "TaskInfo{userId=" + userId + " stackId=" + stackId + " taskId=" + taskId
+ + " displayId=" + displayId
+ " isRunning=" + isRunning
+ " baseIntent=" + baseIntent + " baseActivity=" + baseActivity
+ " topActivity=" + topActivity + " origActivity=" + origActivity