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

Commit 502f8091 authored by Evan Rosky's avatar Evan Rosky Committed by Android (Google) Code Review
Browse files

Merge "If relayout calculates a new configuration, cancel draw" into main

parents c75c9b35 bb1201d2

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

+3 −4
Original line number Diff line number Diff line
@@ -2621,7 +2621,6 @@ 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.
@@ -2850,9 +2849,9 @@ 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.

                    if (mAlwaysSeqId && win.cancelAndRedraw(syncSeqId)) {

                        // Surface-placement has resulted in a new configuration or a new sync,

                        // so this current layout is invalid until subsequent reportResized.

                        result |= RELAYOUT_RES_CANCEL_AND_REDRAW;

                    }

                    outRelayoutResult.syncSeqId = -1;