Merge "Update the last frames in relayout window" (adcd4302) · Commits · e / os / android_frameworks_base

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

+3 −2

Original line number	Diff line number	Diff line
		@@ -2350,8 +2350,9 @@ public class WindowManagerService extends IWindowManager.Stub

		win.setLastReportedMergedConfiguration(mergedConfiguration);

		// Update the last inset values here because the values are sent back to the client.
		// The last inset values represent the last client state.
		// Update the last frames and inset values here because the values are sent back to the
		// client. The last values represent the last client state.
		win.updateLastFrames();
		win.updateLastInsetValues();

		win.getCompatFrame(outFrame);

+7 −2

Original line number	Diff line number	Diff line
		@@ -1308,8 +1308,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP

		// We update mLastFrame always rather than in the conditional with the last inset
		// variables, because mFrameSizeChanged only tracks the width and height changing.
		mWindowFrames.mLastFrame.set(mWindowFrames.mFrame);
		mWindowFrames.mLastRelFrame.set(mWindowFrames.mRelFrame);
		updateLastFrames();

		if (didFrameInsetsChange
		\|\| winAnimator.mSurfaceResized
		@@ -4817,6 +4816,12 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
		return mEmbeddedDisplayContents.remove(dc);
		}

		/** Updates the last frames and relative frames to the current ones. */
		void updateLastFrames() {
		mWindowFrames.mLastFrame.set(mWindowFrames.mFrame);
		mWindowFrames.mLastRelFrame.set(mWindowFrames.mRelFrame);
		}

		/**
		* Updates the last inset values to the current ones.
		*/