Merge "Remove redundant setting of layer stack." (5c13f12f) · Commits · e / os / android_frameworks_base

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

+0 −8

Original line number	Diff line number	Diff line
		@@ -602,13 +602,6 @@ class WindowStateAnimator {
		return mWin.getDisplayContent().getDisplay().getLayerStack();
		}

		void updateLayerStackInTransaction() {
		if (mSurfaceController != null) {
		mSurfaceController.setLayerStackInTransaction(
		getLayerStack());
		}
		}

		void resetDrawState() {
		mDrawState = DRAW_PENDING;

		@@ -732,7 +725,6 @@ class WindowStateAnimator {
		mService.openSurfaceTransaction();
		try {
		mSurfaceController.setPositionInTransaction(mTmpSize.left, mTmpSize.top, false);
		mSurfaceController.setLayerStackInTransaction(getLayerStack());
		} finally {
		mService.closeSurfaceTransaction("createSurfaceLocked");
		}

+0 −6

Original line number	Diff line number	Diff line
		@@ -255,12 +255,6 @@ class WindowToken extends WindowContainer<WindowState> {
		// up with goodToGo, so we don't move a window
		// to another display before the window behind
		// it is ready.
		SurfaceControl.openTransaction();
		for (int i = mChildren.size() - 1; i >= 0; --i) {
		final WindowState win = mChildren.get(i);
		win.mWinAnimator.updateLayerStackInTransaction();
		}
		SurfaceControl.closeTransaction();

		super.onDisplayChanged(dc);
		}