diff options
| author | Craig Mautner <cmautner@google.com> | 2013-05-22 15:03:10 -0700 |
|---|---|---|
| committer | Craig Mautner <cmautner@google.com> | 2013-05-22 17:23:25 -0700 |
| commit | 6d90fed076fad7874e04833110bb1d63cdbc7eac (patch) | |
| tree | 3cc475e8c4d973a0510da22987532a312f1cb818 /core/java/android | |
| parent | 5404f9f1dcf9f0f6f4553a060e4b32645fc37b56 (diff) | |
Add stackId to RecentTaskInfo
Necessary for multi-stack activity overview.
Fixes bug 9092356.
Change-Id: I3d51a7b5cbca6166017759401bb5d31b4ae96f07
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/app/ActivityManager.java | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/core/java/android/app/ActivityManager.java b/core/java/android/app/ActivityManager.java index 729ebd74fdc9..1f6f421a7174 100644 --- a/core/java/android/app/ActivityManager.java +++ b/core/java/android/app/ActivityManager.java @@ -452,14 +452,21 @@ public class ActivityManager { * Description of the task's last state. */ public CharSequence description; - + + /** + * The id of the ActivityStack this Task was on most recently. + */ + public int stackId; + public RecentTaskInfo() { } + @Override public int describeContents() { return 0; } + @Override public void writeToParcel(Parcel dest, int flags) { dest.writeInt(id); dest.writeInt(persistentId); @@ -472,6 +479,7 @@ public class ActivityManager { ComponentName.writeToParcel(origActivity, dest); TextUtils.writeToParcel(description, dest, Parcelable.PARCELABLE_WRITE_RETURN_VALUE); + dest.writeInt(stackId); } public void readFromParcel(Parcel source) { @@ -484,8 +492,9 @@ public class ActivityManager { } origActivity = ComponentName.readFromParcel(source); description = TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(source); + stackId = source.readInt(); } - + public static final Creator<RecentTaskInfo> CREATOR = new Creator<RecentTaskInfo>() { public RecentTaskInfo createFromParcel(Parcel source) { |