Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Still request sync draw if the window is not in sync group" into tm-qpr-dev am: e6c0cb83ce

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18157292

Change-Id: Ie4783d43d77aedcf53e5044152fc38180d5cd718
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Riddle Hsu
2022-05-05 01:43:07 +00:00
committed by Automerger Merge Worker
parent cdd5c24054 e6c0cb83ce
commit 15ea925dac
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/wm/WindowState.java
View File

@@ -5572,7 +5572,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
mLastSurfaceInsets.set(mAttrs.surfaceInsets); mLastSurfaceInsets.set(mAttrs.surfaceInsets);
} }
if (surfaceSizeChanged && mWinAnimator.getShown() && !canPlayMoveAnimation() if (surfaceSizeChanged && mWinAnimator.getShown() && !canPlayMoveAnimation()
&& okToDisplay() && !useBLASTSync()) { && okToDisplay() && mSyncState == SYNC_STATE_NONE) {
applyWithNextDraw(mSetSurfacePositionConsumer); applyWithNextDraw(mSetSurfacePositionConsumer);
} else { } else {
mSetSurfacePositionConsumer.accept(t); mSetSurfacePositionConsumer.accept(t);
@@ -6009,7 +6009,6 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
// We could be more subtle with Integer.MAX_VALUE and track a seqId in the timeout. // We could be more subtle with Integer.MAX_VALUE and track a seqId in the timeout.
finishDrawing(null, Integer.MAX_VALUE); finishDrawing(null, Integer.MAX_VALUE);
mWmService.mH.removeMessages(WINDOW_STATE_BLAST_SYNC_TIMEOUT, this); mWmService.mH.removeMessages(WINDOW_STATE_BLAST_SYNC_TIMEOUT, this);
if (!useBLASTSync()) return;
} }
@Override @Override