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

Commit 6035e019 authored by Wale Ogunwale's avatar Wale Ogunwale
Browse files

Return more information when getAppTasks#getTaskInfo is called. 

The RecentTaskInfo object returned when getAppTasks#getTaskInfo
is called now contains baseActivity, topActivity, and numActivities.

Bug: 18723935
Change-Id: Ifc0cd68a57ed2c0823c23ac8d27e3b6ea6bc95e2
parent 3f2631f5

api/current.txt

+3 −0
Original line number Diff line number Diff line
@@ -3633,12 +3633,15 @@ package android.app { 
    method public void writeToParcel(android.os.Parcel, int);

    field public static final android.os.Parcelable.Creator<android.app.ActivityManager.RecentTaskInfo> CREATOR;

    field public int affiliatedTaskId;

    field public android.content.ComponentName baseActivity;

    field public android.content.Intent baseIntent;

    field public java.lang.CharSequence description;

    field public int id;

    field public int numActivities;

    field public android.content.ComponentName origActivity;

    field public int persistentId;

    field public android.app.ActivityManager.TaskDescription taskDescription;

    field public android.content.ComponentName topActivity;

  }















  public static class ActivityManager.RunningAppProcessInfo implements android.os.Parcelable {

























api/system-current.txt



+3
−0




























Original line number
Diff line number
Diff line








@@ -3722,12 +3722,15 @@ package android.app {













    method public void writeToParcel(android.os.Parcel, int);















    field public static final android.os.Parcelable.Creator<android.app.ActivityManager.RecentTaskInfo> CREATOR;















    field public int affiliatedTaskId;













    field public android.content.ComponentName baseActivity;















    field public android.content.Intent baseIntent;















    field public java.lang.CharSequence description;















    field public int id;













    field public int numActivities;















    field public android.content.ComponentName origActivity;















    field public int persistentId;















    field public android.app.ActivityManager.TaskDescription taskDescription;













    field public android.content.ComponentName topActivity;















  }





























  public static class ActivityManager.RunningAppProcessInfo implements android.os.Parcelable {

























core/java/android/app/ActivityManager.java



+23
−0




























Original line number
Diff line number
Diff line








@@ -862,6 +862,23 @@ public class ActivityManager {













         */















        public int affiliatedTaskColor;





























        /**













         * The component launched as the first activity in the task.













         * This can be considered the "application" of this task.













         */













        public ComponentName baseActivity;



























        /**













         * The activity component at the top of the history stack of the task.













         * This is what the user is currently doing.













         */













        public ComponentName topActivity;



























        /**













         * Number of activities in this task.













         */













        public int numActivities;





























        public RecentTaskInfo() {















        }


























@@ -895,6 +912,9 @@ public class ActivityManager {













            dest.writeLong(lastActiveTime);















            dest.writeInt(affiliatedTaskId);















            dest.writeInt(affiliatedTaskColor);













            ComponentName.writeToParcel(baseActivity, dest);













            ComponentName.writeToParcel(topActivity, dest);













            dest.writeInt(numActivities);















        }































        public void readFromParcel(Parcel source) {









@@ -911,6 +931,9 @@ public class ActivityManager {













            lastActiveTime = source.readLong();















            affiliatedTaskId = source.readInt();















            affiliatedTaskColor = source.readInt();













            baseActivity = ComponentName.readFromParcel(source);













            topActivity = ComponentName.readFromParcel(source);













            numActivities = source.readInt();















        }































        public static final Creator<RecentTaskInfo> CREATOR

































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



+21
−0




























Original line number
Diff line number
Diff line








@@ -7851,6 +7851,27 @@ public final class ActivityManagerService extends ActivityManagerNative













        rti.lastActiveTime = tr.lastActiveTime;















        rti.affiliatedTaskId = tr.mAffiliatedTaskId;















        rti.affiliatedTaskColor = tr.mAffiliatedTaskColor;













        rti.numActivities = 0;

























        ActivityRecord base = null;













        ActivityRecord top = null;













        ActivityRecord tmp;

























        for (int i = tr.mActivities.size() - 1; i >= 0; --i) {













            tmp = tr.mActivities.get(i);













            if (tmp.finishing) {













                continue;













            }













            base = tmp;













            if (top == null || (top.state == ActivityState.INITIALIZING)) {













                top = base;













            }













            rti.numActivities++;













        }

























        rti.baseActivity = (base != null) ? base.intent.getComponent() : null;













        rti.topActivity = (top != null) ? top.intent.getComponent() : null;



























        return rti;















    }















































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



+6
−1




























Original line number
Diff line number
Diff line








@@ -4061,6 +4061,7 @@ final class ActivityStack {













            }















            ActivityRecord r = null;















            ActivityRecord top = null;













            ActivityRecord tmp;















            int numActivities = 0;















            int numRunning = 0;















            final ArrayList<ActivityRecord> activities = task.mActivities;









@@ -4068,7 +4069,11 @@ final class ActivityStack {













                continue;















            }















            for (int activityNdx = activities.size() - 1; activityNdx >= 0; --activityNdx) {













                r = activities.get(activityNdx);













                tmp = activities.get(activityNdx);













                if (tmp.finishing) {













                    continue;













                }













                r = tmp;































                // Initialize state for next task if needed.















                if (top == null || (top.state == ActivityState.INITIALIZING)) {