Merge "Cherry pick task movement changes from aosp" into lmp-sprout-dev (5cd68ee4) · Commits · e / os / android_frameworks_base

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

+6 −0

Original line number	Diff line number	Diff line
		@@ -60,6 +60,12 @@ class Task {
		return removed;
		}

		void setSendingToBottom(boolean toBottom) {
		for (int appTokenNdx = 0; appTokenNdx < mAppTokens.size(); appTokenNdx++) {
		mAppTokens.get(appTokenNdx).sendingToBottom = toBottom;
		}
		}

		@Override
		public String toString() {
		return "{taskId=" + taskId + " appTokens=" + mAppTokens + "}";

+7 −0

Original line number	Diff line number	Diff line
		@@ -5058,6 +5058,10 @@ public class WindowManagerService extends IWindowManager.Stub
		}
		}
		stack.moveTaskToTop(task);
		if (mAppTransition.isTransitionSet()) {
		task.setSendingToBottom(false);
		}
		moveStackWindowsLocked(displayContent);
		}
		} finally {
		Binder.restoreCallingIdentity(origId);
		@@ -5076,6 +5080,9 @@ public class WindowManagerService extends IWindowManager.Stub
		}
		final TaskStack stack = task.mStack;
		stack.moveTaskToBottom(task);
		if (mAppTransition.isTransitionSet()) {
		task.setSendingToBottom(true);
		}
		moveStackWindowsLocked(stack.getDisplayContent());
		}
		} finally {