resolved conflicts for merge of 1ae66595 to master (8dd46f7d) · Commits · e / os / android_frameworks_base

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

+4 −1

Original line number	Diff line number	Diff line
		@@ -405,7 +405,10 @@ public class TaskStack implements DimLayer.DimLayerUser {
		for (int appNdx = appWindowTokens.size() - 1; appNdx >= 0; --appNdx) {
		final WindowList appWindows = appWindowTokens.get(appNdx).allAppWindows;
		for (int winNdx = appWindows.size() - 1; winNdx >= 0; --winNdx) {
		mService.removeWindowInnerLocked(appWindows.get(winNdx));
		// We are in the middle of changing the state of displays/stacks/tasks. We need
		// to finish that, before we let layout interfere with it.
		mService.removeWindowInnerLocked(appWindows.get(winNdx),
		false /* performLayout */);
		doAnotherLayoutPass = true;
		}
		}

+10 −2

Original line number	Diff line number	Diff line
		@@ -2177,6 +2177,10 @@ public class WindowManagerService extends IWindowManager.Stub
		}

		void removeWindowInnerLocked(WindowState win) {
		removeWindowInnerLocked(win, true);
		}

		void removeWindowInnerLocked(WindowState win, boolean performLayout) {
		if (win.mRemoved) {
		// Nothing to do.
		return;
		@@ -2274,7 +2278,9 @@ public class WindowManagerService extends IWindowManager.Stub
		if (displayContent != null) {
		displayContent.layoutNeeded = true;
		}
		if (performLayout) {
		performLayoutAndPlaceSurfacesLocked();
		}
		if (win.mAppToken != null) {
		win.mAppToken.updateReportedVisibilityLocked();
		}
		@@ -4525,8 +4531,10 @@ public class WindowManagerService extends IWindowManager.Stub
		}

		public void removeStack(int stackId) {
		synchronized (mWindowMap) {
		mStackIdToStack.remove(stackId);
		}
		}

		public void removeTask(int taskId) {
		synchronized (mWindowMap) {