Merge "Don't increment seq-id for non-sync frame change" into main (873d33a3) · Commits · e / os / android_frameworks_base

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

+6 −0

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

		final int oldVisibility = win.mViewVisibility;
		final int oldBufferSeqId = win.mBufferSeqId;

		// If the window is becoming visible, visibleOrAdding may change which may in turn
		// change the IME layering target.
		@@ -2837,6 +2838,11 @@ public class WindowManagerService extends IWindowManager.Stub
		: -1;
		win.markRedrawForSyncReported();
		} else {
		if (win.mBufferSeqId > oldBufferSeqId) {
		// A sync was started so this current layout is invalid until subsequent
		// reportResized.
		result \|= RELAYOUT_RES_CANCEL_AND_REDRAW;
		}
		outRelayoutResult.syncSeqId = -1;
		}
		}

+0 −1

Original line number	Diff line number	Diff line
		@@ -3757,7 +3757,6 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
		}
		mSyncSeqId = mBufferSeqId;
		} else if (!mLastConfigReportedToClient
		\|\| mWindowFrames.isFrameSizeChanged()
		\|\| mWindowFrames.isForceReportingResized()
		\|\| mSyncState == SYNC_STATE_WAITING_FOR_DRAW) {
		++mSyncSeqId;