Merge "Remove outdated method about window frames" into main (56f97c80) · Commits · e / os / android_frameworks_base

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

+0 −5

Original line number	Diff line number	Diff line
		@@ -205,7 +205,6 @@ class RootWindowContainer extends WindowContainer<DisplayContent>
		// For seamless rotation cases this always stays true, as the windows complete their orientation
		// changes 1 by 1 without disturbing global state.
		boolean mOrientationChangeComplete = true;
		boolean mWallpaperActionPending = false;

		private final Handler mHandler;

		@@ -1100,10 +1099,6 @@ class RootWindowContainer extends WindowContainer<DisplayContent>
		}
		}

		if ((bulkUpdateParams & SET_WALLPAPER_ACTION_PENDING) != 0) {
		mWallpaperActionPending = true;
		}

		return doRequest;
		}

+1 −21

Original line number	Diff line number	Diff line
		@@ -416,33 +416,13 @@ class WindowStateAnimator {
		}
		}

		void computeShownFrameLocked() {
		if (mWin.mIsWallpaper && mService.mRoot.mWallpaperActionPending) {
		return;
		} else if (mWin.isDragResizeChanged()) {
		// This window is awaiting a relayout because user just started (or ended)
		// drag-resizing. The shown frame (which affects surface size and pos)
		// should not be updated until we get next finished draw with the new surface.
		// Otherwise one or two frames rendered with old settings would be displayed
		// with new geometry.
		return;
		}

		if (DEBUG) {
		Slog.v(TAG, "computeShownFrameLocked: " + this
		+ " not attached, mAlpha=" + mAlpha);
		}

		mShownAlpha = mAlpha;
		}

		void prepareSurfaceLocked(SurfaceControl.Transaction t) {
		final WindowState w = mWin;
		if (!hasSurface()) {
		return;
		}

		computeShownFrameLocked();
		mShownAlpha = mAlpha;

		if (!w.isOnScreen()) {
		hide(t, "prepareSurfaceLocked");

+0 −1

Original line number	Diff line number	Diff line
		@@ -127,7 +127,6 @@ class WindowSurfacePlacer {
		mService.mAnimationHandler.removeCallbacks(mPerformSurfacePlacement);
		loopCount--;
		} while (mTraversalScheduled && loopCount > 0);
		mService.mRoot.mWallpaperActionPending = false;
		}

		private void performSurfacePlacementLoop() {