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

Commit b1abb555 authored by Mark Renouf's avatar Mark Renouf
Browse files

Adds displayId to android.app.TaskInfo 

Bug: 124058588
Test: atest WmTests:TaskStackChangedListenerTest
Change-Id: Ie79a67d3f112be34cdb78fbdb70fd609fd92982a
parent 0d4bc92b

core/java/android/app/TaskInfo.java

+9 −0
Original line number Diff line number Diff line
@@ -96,6 +96,12 @@ public class TaskInfo { 
    @UnsupportedAppUsage

    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

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

+2 −0
Original line number Diff line number Diff line
@@ -119,6 +119,7 @@ import android.util.DisplayMetrics; 
import android.util.EventLog;

import android.util.Slog;

import android.util.proto.ProtoOutputStream;

import android.view.Display;

import android.view.DisplayInfo;



import com.android.internal.annotations.VisibleForTesting;
@@ -2332,6 +2333,7 @@ class TaskRecord extends ConfigurationContainer { 
        info.userId = userId;

        info.stackId = getStackId();

        info.taskId = taskId;

        info.displayId = mStack == null ? Display.INVALID_DISPLAY : mStack.mDisplayId;

        info.isRunning = getTopActivity() != null;

        info.baseIntent = new Intent(getBaseIntent());

        info.baseActivity = reuseActivitiesReport.base != null