Revert "Log stack issues and start resize effort." (befa8b55) · Commits · e / os / android_frameworks_base

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

+0 −17

Original line number	Diff line number	Diff line
		@@ -104,7 +104,6 @@ public class Am extends BaseCommand {
		" am stop-user <USER_ID>\n" +
		" am stack create <TASK_ID> <RELATIVE_STACK_ID> <POSITION> <WEIGHT>\n" +
		" am stack movetask <STACK_ID> <TASK_ID> [true\|false]\n" +
		" am stack resize <STACK_ID> <WEIGHT>\n" +
		" am stack dump\n" +
		"\n" +
		"am start: start an Activity. Options are:\n" +
		@@ -200,8 +199,6 @@ public class Am extends BaseCommand {
		"am stack movetask: move <TASK_ID> from its current stack to the top (true) or" +
		" bottom (false) of <STACK_ID>.\n" +
		"\n" +
		"am stack resize: change <STACK_ID> relative size to new <WEIGHT>.\n" +
		"\n" +
		"am stack dump: list the hierarchy of stacks.\n" +
		"\n" +
		"<INTENT> specifications include these flags and arguments:\n" +
		@@ -1484,8 +1481,6 @@ public class Am extends BaseCommand {
		runStackCreate();
		} else if (op.equals("movetask")) {
		runStackMoveTask();
		} else if (op.equals("resize")) {
		runStackResize();
		} else if (op.equals("dump")) {
		runStackDump();
		} else {
		@@ -1533,18 +1528,6 @@ public class Am extends BaseCommand {
		}
		}

		private void runStackResize() throws Exception {
		String stackIdStr = nextArgRequired();
		int stackId = Integer.valueOf(stackIdStr);
		String weightStr = nextArgRequired();
		float weight = Float.valueOf(weightStr);

		try {
		mAm.resizeStack(stackId, weight);
		} catch (RemoteException e) {
		}
		}

		private void runStackDump() throws Exception {
		try {
		List<ActivityManager.StackInfo> stacks = mAm.getStacks();

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

+7 −10

Original line number	Diff line number	Diff line
		@@ -6326,11 +6326,6 @@ public final class ActivityManagerService extends ActivityManagerNative

		@Override
		public void moveTaskToStack(int taskId, int stackId, boolean toTop) {
		if (stackId == HOME_STACK_ID) {
		Slog.e(TAG, "moveTaskToStack: Attempt to move task to home stack",
		new RuntimeException("here").fillInStackTrace());
		return;
		}
		synchronized (this) {
		mWindowManager.moveTaskToStack(taskId, stackId, toTop);
		mStackSupervisor.moveTaskToStack(taskId, stackId, toTop);
		@@ -6393,8 +6388,8 @@ public final class ActivityManagerService extends ActivityManagerNative

		final void sendPendingThumbnail(ActivityRecord r, IBinder token,
		Bitmap thumbnail, CharSequence description, boolean always) {
		TaskRecord task;
		ArrayList<PendingThumbnailsRecord> receivers = null;
		TaskRecord task = null;
		ArrayList receivers = null;

		//System.out.println("Send pending thumbnail: " + r);

		@@ -6420,11 +6415,12 @@ public final class ActivityManagerService extends ActivityManagerNative
		int N = mPendingThumbnails.size();
		int i=0;
		while (i<N) {
		PendingThumbnailsRecord pr = mPendingThumbnails.get(i);
		PendingThumbnailsRecord pr =
		(PendingThumbnailsRecord)mPendingThumbnails.get(i);
		//System.out.println("Looking in " + pr.pendingRecords);
		if (pr.pendingRecords.remove(r)) {
		if (receivers == null) {
		receivers = new ArrayList<PendingThumbnailsRecord>();
		receivers = new ArrayList();
		}
		receivers.add(pr);
		if (pr.pendingRecords.size() == 0) {
		@@ -6442,7 +6438,8 @@ public final class ActivityManagerService extends ActivityManagerNative
		final int N = receivers.size();
		for (int i=0; i<N; i++) {
		try {
		PendingThumbnailsRecord pr = receivers.get(i);
		PendingThumbnailsRecord pr =
		(PendingThumbnailsRecord)receivers.get(i);
		pr.receiver.newThumbnail(
		task != null ? task.taskId : -1, thumbnail, description);
		if (pr.finished) {

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

+4 −10

Original line number	Diff line number	Diff line
		@@ -304,7 +304,7 @@ public class ActivityStackSupervisor {
		final int stackId = stack.mStackId;
		final int nextStackId = mWindowManager.removeStack(stackId);
		// TODO: Perhaps we need to let the ActivityManager determine the next focus...
		if (getFocusedStack().mStackId == stackId) {
		if (mFocusedStack.mStackId == stackId) {
		mFocusedStack = nextStackId == HOME_STACK_ID ? null : getStack(nextStackId);
		}
		}
		@@ -1189,13 +1189,6 @@ public class ActivityStackSupervisor {
		mStackState = STACK_STATE_HOME_TO_FRONT;
		}
		} else {
		if (r.task.stack == mHomeStack) {
		// Try to correct, but how did we get here?
		Slog.e(TAG, "!!! setFocusedStack: home stack used for non-home activity !!!",
		new RuntimeException("here").fillInStackTrace());
		moveTaskToStack(r.task.taskId, getCorrectStack(r).mStackId, true);
		// r.task.stack has now changed.
		}
		mFocusedStack = r.task.stack;
		if (mStackState != STACK_STATE_HOME_IN_BACK) {
		mStackState = STACK_STATE_HOME_TO_BACK;
		@@ -1605,9 +1598,10 @@ public class ActivityStackSupervisor {
		// This not being started from an existing activity, and not part
		// of a new task... just put it in the top task, though these days
		// this case should never happen.
		targetStack = getCorrectStack(r);
		ActivityStack lastStack = getLastStack();
		targetStack = lastStack != null ? lastStack : mHomeStack;
		moveHomeStack(targetStack.isHomeStack());
		ActivityRecord prev = targetStack.topActivity();
		ActivityRecord prev = lastStack == null ? null : targetStack.topActivity();
		r.setTask(prev != null ? prev.task
		: targetStack.createTaskRecord(getNextTaskId(), r.info, intent, true),
		null, true);