Added AM API to remove a stack (06e8ee0c) · Commits · e / os / android_frameworks_base

cmds/am/src/com/android/commands/am/Am.java

+12 −0

Original line number	Diff line number	Diff line
		@@ -167,6 +167,7 @@ public class Am extends BaseCommand {
		" am stack positiontask <TASK_ID> <STACK_ID> <POSITION>\n" +
		" am stack list\n" +
		" am stack info <STACK_ID>\n" +
		" am stack remove <STACK_ID>\n" +
		" am task lock <TASK_ID>\n" +
		" am task lock stop\n" +
		" am task resizeable <TASK_ID> [0 (unresizeable) \| 1 (crop_windows) \| 2 (resizeable) \| 3 (resizeable_and_pipable)]\n" +
		@@ -324,6 +325,8 @@ public class Am extends BaseCommand {
		"\n" +
		"am stack info: display the information about activity stack <STACK_ID>.\n" +
		"\n" +
		"am stack remove: remove stack <STACK_ID>.\n" +
		"\n" +
		"am task lock: bring <TASK_ID> to the front and don't allow other tasks to run.\n" +
		"\n" +
		"am task lock stop: end the current task lock.\n" +
		@@ -1732,6 +1735,9 @@ public class Am extends BaseCommand {
		case "size-docked-stack-test":
		runStackSizeDockedStackTest();
		break;
		case "remove":
		runStackRemove();
		break;
		default:
		showError("Error: unknown command '" + op + "'");
		break;
		@@ -1868,6 +1874,12 @@ public class Am extends BaseCommand {
		}
		}

		private void runStackRemove() throws Exception {
		String stackIdStr = nextArgRequired();
		int stackId = Integer.valueOf(stackIdStr);
		mAm.removeStack(stackId);
		}

		private void runMoveTopActivityToPinnedStack() throws Exception {
		int stackId = Integer.valueOf(nextArgRequired());
		final Rect bounds = getBounds();

+19 −0

Original line number	Diff line number	Diff line
		@@ -2887,6 +2887,13 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM
		reply.writeNoException();
		return true;
		}
		case REMOVE_STACK: {
		data.enforceInterface(IActivityManager.descriptor);
		final int stackId = data.readInt();
		removeStack(stackId);
		reply.writeNoException();
		return true;
		}
		}

		return super.onTransact(code, data, reply, flags);
		@@ -6747,5 +6754,17 @@ class ActivityManagerProxy implements IActivityManager
		reply.recycle();
		};

		@Override
		public void removeStack(int stackId) throws RemoteException {
		Parcel data = Parcel.obtain();
		Parcel reply = Parcel.obtain();
		data.writeInterfaceToken(IActivityManager.descriptor);
		data.writeInt(stackId);
		mRemote.transact(REMOVE_STACK, data, reply, 0);
		reply.readException();
		data.recycle();
		reply.recycle();
		}

		private IBinder mRemote;
		}

+3 −0

Original line number	Diff line number	Diff line
		@@ -599,6 +599,8 @@ public interface IActivityManager extends IInterface {

		public void notifyPinnedStackAnimationEnded() throws RemoteException;

		public void removeStack(int stackId) throws RemoteException;

		/*
		* Private non-Binder interfaces
		*/
		@@ -975,4 +977,5 @@ public interface IActivityManager extends IInterface {
		int STOP_LOCAL_VOICE_INTERACTION_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION + 364;
		int SUPPORTS_LOCAL_VOICE_INTERACTION_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION + 365;
		int NOTIFY_PINNED_STACK_ANIMATION_ENDED_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION + 366;
		int REMOVE_STACK = IBinder.FIRST_CALL_TRANSACTION + 367;
		}

+2 −14

Original line number	Diff line number	Diff line
		@@ -205,22 +205,10 @@ public class PipManager {
		public void closePip() {
		mState = STATE_NO_PIP;
		mPipTaskId = TASK_ID_NO_PIP;
		StackInfo stackInfo = null;
		try {
		stackInfo = mActivityManager.getStackInfo(PINNED_STACK_ID);
		if (stackInfo == null) {
		return;
		}
		mActivityManager.removeStack(PINNED_STACK_ID);
		} catch (RemoteException e) {
		Log.e(TAG, "getStackInfo failed", e);
		return;
		}
		for (int taskId : stackInfo.taskIds) {
		try {
		mActivityManager.removeTask(taskId);
		} catch (RemoteException e) {
		Log.e(TAG, "removeTask failed", e);
		}
		Log.e(TAG, "removeStack failed", e);
		}
		}

+27 −3

Original line number	Diff line number	Diff line
		@@ -9208,12 +9208,36 @@ public final class ActivityManagerService extends ActivityManagerNative
		return false;
		}

		@Override
		public void removeStack(int stackId) {
		enforceCallingPermission(Manifest.permission.MANAGE_ACTIVITY_STACKS, "removeStack()");
		if (stackId == HOME_STACK_ID) {
		throw new IllegalArgumentException("Removing home stack is not allowed.");
		}

		synchronized (this) {
		final long ident = Binder.clearCallingIdentity();
		try {
		final ActivityStack stack = mStackSupervisor.getStack(stackId);
		if (stack == null) {
		return;
		}
		final ArrayList<TaskRecord> tasks = stack.getAllTasks();
		for (int i = tasks.size() - 1; i >= 0; i--) {
		removeTaskByIdLocked(
		tasks.get(i).taskId, true /* killProcess */, REMOVE_FROM_RECENTS);
		}
		} finally {
		Binder.restoreCallingIdentity(ident);
		}
		}
		}

		@Override
		public boolean removeTask(int taskId) {
		enforceCallingPermission(android.Manifest.permission.REMOVE_TASKS, "removeTask()");
		synchronized (this) {
		enforceCallingPermission(android.Manifest.permission.REMOVE_TASKS,
		"removeTask()");
		long ident = Binder.clearCallingIdentity();
		final long ident = Binder.clearCallingIdentity();
		try {
		return removeTaskByIdLocked(taskId, true, REMOVE_FROM_RECENTS);
		} finally {