Merge "Add stackId to RecentTaskInfo" (a22cbf98) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityManager.java

+11 −2

Original line number	Diff line number	Diff line
		@@ -453,13 +453,20 @@ public class ActivityManager {
		*/
		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,6 +492,7 @@ public class ActivityManager {
		}
		origActivity = ComponentName.readFromParcel(source);
		description = TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(source);
		stackId = source.readInt();
		}

		public static final Creator<RecentTaskInfo> CREATOR

+2 −1

Original line number	Diff line number	Diff line
		@@ -6062,6 +6062,7 @@ public final class ActivityManagerService extends ActivityManagerNative
		}
		rti.origActivity = tr.origActivity;
		rti.description = tr.lastDescription;
		rti.stackId = tr.stack.mStackId;

		if ((flags&ActivityManager.RECENT_IGNORE_UNAVAILABLE) != 0) {
		// Check whether this activity is currently available.