Merge "Remove ATM#positionTaskInStack API" (6de0c0a5) · Commits · e / os / android_frameworks_base

core/java/android/app/IActivityManager.aidl

+0 −7

Original line number	Diff line number	Diff line
		@@ -513,13 +513,6 @@ interface IActivityManager {
		// descriptor.
		@UnsupportedAppUsage
		boolean stopBinderTrackingAndDump(in ParcelFileDescriptor fd);
		/**
		* Try to place task to provided position. The final position might be different depending on
		* current user and stacks state. The task will be moved to target stack if it's currently in
		* different stack.
		*/
		@UnsupportedAppUsage
		void positionTaskInStack(int taskId, int stackId, int position);
		@UnsupportedAppUsage
		void suppressResizeConfigChanges(boolean suppress);
		@UnsupportedAppUsage

core/java/android/app/IActivityTaskManager.aidl

+0 −6

Original line number	Diff line number	Diff line
		@@ -295,12 +295,6 @@ interface IActivityTaskManager {
		ComponentName getActivityClassForToken(in IBinder token);
		String getPackageForToken(in IBinder token);

		/**
		* Try to place task to provided position. The final position might be different depending on
		* current user and stacks state. The task will be moved to target stack if it's currently in
		* different stack.
		*/
		void positionTaskInStack(int taskId, int stackId, int position);
		void reportSizeConfigurations(in IBinder token, in int[] horizontalSizeConfiguration,
		in int[] verticalSizeConfigurations, in int[] smallestWidthConfigurations);

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

+0 −5

Original line number	Diff line number	Diff line
		@@ -5752,11 +5752,6 @@ public class ActivityManagerService extends IActivityManager.Stub
		return mActivityTaskManager.moveTopActivityToPinnedStack(stackId, bounds);
		}

		@Override
		public void positionTaskInStack(int taskId, int stackId, int position) {
		mActivityTaskManager.positionTaskInStack(taskId, stackId, position);
		}

		@Override
		public List<RootTaskInfo> getAllRootTaskInfos() {
		return mActivityTaskManager.getAllRootTaskInfos();

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

+0 −14

Original line number	Diff line number	Diff line
		@@ -2582,8 +2582,6 @@ final class ActivityManagerShellCommand extends ShellCommand {
		switch (op) {
		case "move-task":
		return runStackMoveTask(pw);
		case "positiontask":
		return runStackPositionTask(pw);
		case "list":
		return runStackList(pw);
		case "info":
		@@ -2656,18 +2654,6 @@ final class ActivityManagerShellCommand extends ShellCommand {
		return 0;
		}

		int runStackPositionTask(PrintWriter pw) throws RemoteException {
		String taskIdStr = getNextArgRequired();
		int taskId = Integer.parseInt(taskIdStr);
		String stackIdStr = getNextArgRequired();
		int stackId = Integer.parseInt(stackIdStr);
		String positionStr = getNextArgRequired();
		int position = Integer.parseInt(positionStr);

		mTaskInterface.positionTaskInStack(taskId, stackId, position);
		return 0;
		}

		int runStackList(PrintWriter pw) throws RemoteException {
		List<RootTaskInfo> tasks = mTaskInterface.getAllRootTaskInfos();
		for (RootTaskInfo info : tasks) {

services/core/java/com/android/server/wm/ActivityTaskManagerService.java

+0 −47

Original line number	Diff line number	Diff line
		@@ -123,7 +123,6 @@ import static com.android.server.wm.Task.ActivityState.DESTROYED;
		import static com.android.server.wm.Task.ActivityState.DESTROYING;
		import static com.android.server.wm.Task.LOCK_TASK_AUTH_DONT_LOCK;
		import static com.android.server.wm.Task.REPARENT_KEEP_STACK_AT_FRONT;
		import static com.android.server.wm.Task.REPARENT_LEAVE_STACK_IN_PLACE;
		import static com.android.server.wm.WindowContainer.POSITION_TOP;
		import static com.android.server.wm.WindowManagerService.UPDATE_FOCUS_NORMAL;

		@@ -3952,52 +3951,6 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
		}
		}

		/**
		* Try to place task to provided position. The final position might be different depending on
		* current user and stacks state. The task will be moved to target stack if it's currently in
		* different stack.
		*/
		@Override
		public void positionTaskInStack(int taskId, int stackId, int position) {
		mAmInternal.enforceCallingPermission(MANAGE_ACTIVITY_STACKS, "positionTaskInStack()");
		synchronized (mGlobalLock) {
		long ident = Binder.clearCallingIdentity();
		try {
		if (DEBUG_STACK) Slog.d(TAG_STACK, "positionTaskInStack: positioning task="
		+ taskId + " in stackId=" + stackId + " at position=" + position);
		final Task task = mRootWindowContainer.anyTaskForId(taskId);
		if (task == null) {
		throw new IllegalArgumentException("positionTaskInStack: no task for id="
		+ taskId);
		}

		final Task stack = mRootWindowContainer.getStack(stackId);

		if (stack == null) {
		throw new IllegalArgumentException("positionTaskInStack: no stack for id="
		+ stackId);
		}
		if (!stack.isActivityTypeStandardOrUndefined()) {
		throw new IllegalArgumentException("positionTaskInStack: Attempt to change"
		+ " the position of task " + taskId + " in/to non-standard stack");
		}

		// TODO: Have the callers of this API call a separate reparent method if that is
		// what they intended to do vs. having this method also do reparenting.
		if (task.getRootTask() == stack) {
		// Change position in current stack.
		stack.positionChildAt(task, position);
		} else {
		// Reparent to new stack.
		task.reparent(stack, position, REPARENT_LEAVE_STACK_IN_PLACE, !ANIMATE,
		!DEFER_RESUME, "positionTaskInStack");
		}
		} finally {
		Binder.restoreCallingIdentity(ident);
		}
		}
		}

		@Override
		public void reportSizeConfigurations(IBinder token, int[] horizontalSizeConfiguration,
		int[] verticalSizeConfigurations, int[] smallestSizeConfigurations) {