Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 15ea925d authored by Riddle Hsu's avatar Riddle Hsu Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: Ie4783d43d77aedcf53e5044152fc38180d5cd718
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cdd5c240 e6c0cb83

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

+1 −2
Original line number Diff line number Diff line
@@ -5572,7 +5572,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 
                mLastSurfaceInsets.set(mAttrs.surfaceInsets);

            }

            if (surfaceSizeChanged && mWinAnimator.getShown() && !canPlayMoveAnimation()

                    && okToDisplay() && !useBLASTSync()) {

                    && okToDisplay() && mSyncState == SYNC_STATE_NONE) {

                applyWithNextDraw(mSetSurfacePositionConsumer);

            } else {

                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.

        finishDrawing(null, Integer.MAX_VALUE);

        mWmService.mH.removeMessages(WINDOW_STATE_BLAST_SYNC_TIMEOUT, this);

        if (!useBLASTSync()) return;

    }



    @Override