Merge "Replace StackInfo with TaskInfo" (80ffe3f0) · Commits · e / os / android_frameworks_base

api/test-current.txt

+0 −1

Original line number	Diff line number	Diff line
		@@ -133,7 +133,6 @@ package android.app {
		public class ActivityTaskManager {
		method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS) public void clearLaunchParamsForPackages(java.util.List<java.lang.String>);
		method public static boolean currentUiModeSupportsErrorDialogs(@NonNull android.content.Context);
		method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS) public String listAllStacks();
		method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS) public void moveTaskToStack(int, int, boolean);
		method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS) public boolean moveTopActivityToPinnedStack(int, android.graphics.Rect);
		method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS) public void removeStacksInWindowingModes(int[]) throws java.lang.SecurityException;

core/java/android/app/ActivityManager.aidl

+0 −2

Original line number	Diff line number	Diff line
		@@ -24,8 +24,6 @@ parcelable ActivityManager.RunningAppProcessInfo;
		parcelable ActivityManager.RunningServiceInfo;
		parcelable ActivityManager.RunningTaskInfo;
		/** @hide */
		parcelable ActivityManager.StackInfo;
		/** @hide */
		parcelable ActivityManager.TaskThumbnail;
		/** @hide */
		parcelable ActivityManager.TaskSnapshot;
		No newline at end of file

core/java/android/app/ActivityManager.java

+0 −155

Original line number	Diff line number	Diff line
		@@ -76,7 +76,6 @@ import android.util.DisplayMetrics;
		import android.util.Singleton;
		import android.util.Size;
		import android.view.Surface;
		import android.window.WindowContainerToken;

		import com.android.internal.app.LocalePicker;
		import com.android.internal.app.procstats.ProcessStats;
		@@ -2814,160 +2813,6 @@ public class ActivityManager {
		}
		}

		/**
		* Information you can retrieve about an ActivityStack in the system.
		* @hide
		*/
		public static class StackInfo implements Parcelable {
		@UnsupportedAppUsage
		public int stackId;
		@UnsupportedAppUsage
		public Rect bounds = new Rect();
		@UnsupportedAppUsage
		public int[] taskIds;
		@UnsupportedAppUsage
		public String[] taskNames;
		@UnsupportedAppUsage
		public Rect[] taskBounds;
		@UnsupportedAppUsage
		public int[] taskUserIds;
		@UnsupportedAppUsage
		public ComponentName topActivity;
		@UnsupportedAppUsage
		public int displayId;
		@UnsupportedAppUsage
		public int userId;
		@UnsupportedAppUsage
		public boolean visible;
		// Index of the stack in the display's stack list, can be used for comparison of stack order
		// TODO: Can be removed since no one is using it.
		@UnsupportedAppUsage
		@Deprecated
		public int position;
		public WindowContainerToken stackToken;
		/**
		* The full configuration the stack is currently running in.
		* @hide
		*/
		final public Configuration configuration = new Configuration();

		@Override
		public int describeContents() {
		return 0;
		}

		@Override
		public void writeToParcel(Parcel dest, int flags) {
		dest.writeInt(stackId);
		dest.writeInt(bounds.left);
		dest.writeInt(bounds.top);
		dest.writeInt(bounds.right);
		dest.writeInt(bounds.bottom);
		dest.writeIntArray(taskIds);
		dest.writeStringArray(taskNames);
		final int boundsCount = taskBounds == null ? 0 : taskBounds.length;
		dest.writeInt(boundsCount);
		for (int i = 0; i < boundsCount; i++) {
		dest.writeInt(taskBounds[i].left);
		dest.writeInt(taskBounds[i].top);
		dest.writeInt(taskBounds[i].right);
		dest.writeInt(taskBounds[i].bottom);
		}
		dest.writeIntArray(taskUserIds);
		dest.writeInt(displayId);
		dest.writeInt(userId);
		dest.writeInt(visible ? 1 : 0);
		dest.writeInt(position);
		stackToken.writeToParcel(dest, 0);
		if (topActivity != null) {
		dest.writeInt(1);
		topActivity.writeToParcel(dest, 0);
		} else {
		dest.writeInt(0);
		}
		configuration.writeToParcel(dest, flags);
		}

		public void readFromParcel(Parcel source) {
		stackId = source.readInt();
		bounds = new Rect(
		source.readInt(), source.readInt(), source.readInt(), source.readInt());
		taskIds = source.createIntArray();
		taskNames = source.createStringArray();
		final int boundsCount = source.readInt();
		if (boundsCount > 0) {
		taskBounds = new Rect[boundsCount];
		for (int i = 0; i < boundsCount; i++) {
		taskBounds[i] = new Rect();
		taskBounds[i].set(
		source.readInt(), source.readInt(), source.readInt(), source.readInt());
		}
		} else {
		taskBounds = null;
		}
		taskUserIds = source.createIntArray();
		displayId = source.readInt();
		userId = source.readInt();
		visible = source.readInt() > 0;
		position = source.readInt();
		stackToken = WindowContainerToken.CREATOR.createFromParcel(source);
		if (source.readInt() > 0) {
		topActivity = ComponentName.readFromParcel(source);
		}
		configuration.readFromParcel(source);
		}

		public static final @android.annotation.NonNull Creator<StackInfo> CREATOR = new Creator<StackInfo>() {
		@Override
		public StackInfo createFromParcel(Parcel source) {
		return new StackInfo(source);
		}
		@Override
		public StackInfo[] newArray(int size) {
		return new StackInfo[size];
		}
		};

		public StackInfo() {
		}

		private StackInfo(Parcel source) {
		readFromParcel(source);
		}

		@UnsupportedAppUsage
		public String toString(String prefix) {
		StringBuilder sb = new StringBuilder(256);
		sb.append(prefix); sb.append("Stack id="); sb.append(stackId);
		sb.append(" bounds="); sb.append(bounds.toShortString());
		sb.append(" displayId="); sb.append(displayId);
		sb.append(" userId="); sb.append(userId);
		sb.append("\n");
		sb.append(" configuration="); sb.append(configuration);
		sb.append("\n");
		prefix = prefix + " ";
		for (int i = 0; i < taskIds.length; ++i) {
		sb.append(prefix); sb.append("taskId="); sb.append(taskIds[i]);
		sb.append(": "); sb.append(taskNames[i]);
		if (taskBounds != null) {
		sb.append(" bounds="); sb.append(taskBounds[i].toShortString());
		}
		sb.append(" userId=").append(taskUserIds[i]);
		sb.append(" visible=").append(visible);
		if (topActivity != null) {
		sb.append(" topActivity=").append(topActivity);
		}
		sb.append("\n");
		}
		return sb.toString();
		}

		@Override
		public String toString() {
		return toString("");
		}
		}

		/**
		* @hide
		*/

core/java/android/app/ActivityTaskManager.aidl

0 → 100644

+20 −0

Original line number	Diff line number	Diff line
		/**
		* Copyright (c) 2020, The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.app;

		/** @hide */
		parcelable ActivityTaskManager.RootTaskInfo;
		No newline at end of file

core/java/android/app/ActivityTaskManager.java

+94 −21

Original line number	Diff line number	Diff line
		@@ -29,6 +29,8 @@ import android.graphics.Rect;
		import android.os.Build;
		import android.os.Handler;
		import android.os.IBinder;
		import android.os.Parcel;
		import android.os.Parcelable;
		import android.os.RemoteException;
		import android.os.ServiceManager;
		import android.util.DisplayMetrics;
		@@ -390,27 +392,6 @@ public class ActivityTaskManager {
		}
		}

		/**
		* List all activity stacks information.
		*/
		@RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS)
		public String listAllStacks() {
		final List<ActivityManager.StackInfo> stacks;
		try {
		stacks = getService().getAllStackInfos();
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}

		final StringBuilder sb = new StringBuilder();
		if (stacks != null) {
		for (ActivityManager.StackInfo info : stacks) {
		sb.append(info).append("\n");
		}
		}
		return sb.toString();
		}

		/**
		* Clears launch params for the given package.
		* @param packageNames the names of the packages of which the launch params are to be cleared
		@@ -468,4 +449,96 @@ public class ActivityTaskManager {
		final Configuration config = context.getResources().getConfiguration();
		return currentUiModeSupportsErrorDialogs(config);
		}

		/**
		* Information you can retrieve about a root task in the system.
		* @hide
		*/
		public static class RootTaskInfo extends TaskInfo implements Parcelable {
		// TODO(b/148895075): Move some of the fields to TaskInfo.
		public Rect bounds = new Rect();
		public int[] childTaskIds;
		public String[] childTaskNames;
		public Rect[] childTaskBounds;
		public int[] childTaskUserIds;
		public boolean visible;
		// Index of the stack in the display's stack list, can be used for comparison of stack order
		public int position;

		@Override
		public int describeContents() {
		return 0;
		}

		@Override
		public void writeToParcel(Parcel dest, int flags) {
		dest.writeTypedObject(bounds, flags);
		dest.writeIntArray(childTaskIds);
		dest.writeStringArray(childTaskNames);
		dest.writeTypedArray(childTaskBounds, flags);
		dest.writeIntArray(childTaskUserIds);
		dest.writeInt(visible ? 1 : 0);
		dest.writeInt(position);
		super.writeToParcel(dest, flags);
		}

		@Override
		void readFromParcel(Parcel source) {
		bounds = source.readTypedObject(Rect.CREATOR);
		childTaskIds = source.createIntArray();
		childTaskNames = source.createStringArray();
		childTaskBounds = source.createTypedArray(Rect.CREATOR);
		childTaskUserIds = source.createIntArray();
		visible = source.readInt() > 0;
		position = source.readInt();
		super.readFromParcel(source);
		}

		public static final @NonNull Creator<RootTaskInfo> CREATOR = new Creator<>() {
		@Override
		public RootTaskInfo createFromParcel(Parcel source) {
		return new RootTaskInfo(source);
		}

		@Override
		public RootTaskInfo[] newArray(int size) {
		return new RootTaskInfo[size];
		}
		};

		public RootTaskInfo() {
		}

		private RootTaskInfo(Parcel source) {
		readFromParcel(source);
		}

		@Override
		public String toString() {
		StringBuilder sb = new StringBuilder(256);
		sb.append("RootTask id="); sb.append(taskId);
		sb.append(" bounds="); sb.append(bounds.toShortString());
		sb.append(" displayId="); sb.append(displayId);
		sb.append(" userId="); sb.append(userId);
		sb.append("\n");

		sb.append(" configuration="); sb.append(configuration);
		sb.append("\n");

		for (int i = 0; i < childTaskIds.length; ++i) {
		sb.append(" taskId="); sb.append(childTaskIds[i]);
		sb.append(": "); sb.append(childTaskNames[i]);
		if (childTaskBounds != null) {
		sb.append(" bounds="); sb.append(childTaskBounds[i].toShortString());
		}
		sb.append(" userId=").append(childTaskUserIds[i]);
		sb.append(" visible=").append(visible);
		if (topActivity != null) {
		sb.append(" topActivity=").append(topActivity);
		}
		sb.append("\n");
		}
		return sb.toString();
		}
		}
		}