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

Commit bbf746f3 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Force relayout if sync operation is requested explicitly" into sc-dev... 

Merge "Force relayout if sync operation is requested explicitly" into sc-dev am: 2498beaa am: 643cb5ea

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

Change-Id: I02d2db2daa29d526436c33de3a8ad98cd19638f1
parents c8869140 643cb5ea

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

+10 −5
Original line number Diff line number Diff line
@@ -3840,8 +3840,9 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 


        fillClientWindowFramesAndConfiguration(mClientWindowFrames, mLastReportedConfiguration,

                true /* useLatestConfig */, false /* relayoutVisible */);

        final boolean reportDraw = drawPending || useBLASTSync() || !mRedrawForSyncReported;

        final boolean forceRelayout = reportOrientation || isDragResizeChanged() || !mRedrawForSyncReported;

        final boolean syncRedraw = shouldSendRedrawForSync();

        final boolean reportDraw = syncRedraw || drawPending;

        final boolean forceRelayout = syncRedraw || reportOrientation || isDragResizeChanged();

        final DisplayContent displayContent = getDisplayContent();

        final boolean alwaysConsumeSystemBars =

                displayContent.getDisplayPolicy().areSystemBarsForcedShownLw(this);
@@ -5939,10 +5940,14 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 
     * for Windows involved in these Syncs

     */

    private boolean shouldSendRedrawForSync() {

        if (mRedrawForSyncReported) {

            return false;

        }

        final Task task = getTask();

        if (task != null && task.getMainWindowSizeChangeTransaction() != null)

            return !mRedrawForSyncReported;

        return useBLASTSync() && !mRedrawForSyncReported;

        if (task != null && task.getMainWindowSizeChangeTransaction() != null) {

            return true;

        }

        return useBLASTSync();

    }



    void requestRedrawForSync() {