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

Commit 9d851de6 authored by Craig Mautner's avatar Craig Mautner
Browse files

Revert "Add stackId to RecentTaskInfo" 

Need to modify the API as well.
This reverts commit b9b94775

Change-Id: I34ea371408930b6b1bf4c53ad9ab8418b0070dbc
parent b9b94775

core/java/android/app/ActivityManager.java

+2 −11
Original line number Diff line number Diff line
@@ -453,20 +453,13 @@ 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);
@@ -479,7 +472,6 @@ public class ActivityManager { 
            ComponentName.writeToParcel(origActivity, dest);

            TextUtils.writeToParcel(description, dest,

                    Parcelable.PARCELABLE_WRITE_RETURN_VALUE);

            dest.writeInt(stackId);

        }



        public void readFromParcel(Parcel source) {
@@ -492,7 +484,6 @@ public class ActivityManager { 
            }

            origActivity = ComponentName.readFromParcel(source);

            description = TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(source);

            stackId = source.readInt();

        }

        

        public static final Creator<RecentTaskInfo> CREATOR

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

+1 −2
Original line number Diff line number Diff line
@@ -6062,7 +6062,6 @@ 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.