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

Commit e1618ffa authored by Evan Rosky's avatar Evan Rosky
Browse files

Include forceReport in conditions for seq-id increment 

waitForAllWindowsDrawn uses forceReportResized to trigger
a report-draw. This means we need to increment seq-id when
this happens too.

Bug: 430136535
Test: with flag enabled, turn-on screen, observe no timeout
Flag: com.android.window.flags.always_seq_id_layout
Change-Id: I3592752edb7495861d0bdb61574ed2d8672ac246
parent f03f56ad

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

+7 −0
Original line number Diff line number Diff line
@@ -123,6 +123,13 @@ public class WindowFrames { 
        return mFrameSizeChanged || didFrameSizeChange();

    }



    /**

     * @return true if a resize report is currently required.

     */

    boolean isForceReportingResized() {

        return mLastForceReportingResized;

    }



    /**

     * Resets the size changed flags so they're all set to false again. This should be called

     * after the frames are reported to client.

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

+1 −0
Original line number Diff line number Diff line
@@ -3760,6 +3760,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 
                mSyncSeqId = mBufferSeqId;

            } else if (!mLastConfigReportedToClient

                    || mWindowFrames.isFrameSizeChanged()

                    || mWindowFrames.isForceReportingResized()

                    || mSyncState == SYNC_STATE_WAITING_FOR_DRAW) {

                ++mSyncSeqId;

            }