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

Commit adcd4302 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update the last frames in relayout window"

parents 023e1e45 2652da82

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

+3 −2
Original line number Original line Diff line number Diff line
@@ -2350,8 +2350,9 @@ public class WindowManagerService extends IWindowManager.Stub 




            win.setLastReportedMergedConfiguration(mergedConfiguration);

            win.setLastReportedMergedConfiguration(mergedConfiguration);





            // Update the last inset values here because the values are sent back to the client.

            // Update the last frames and inset values here because the values are sent back to the

            // The last inset values represent the last client state.

            // client. The last values represent the last client state.

            win.updateLastFrames();

            win.updateLastInsetValues();

            win.updateLastInsetValues();





            win.getCompatFrame(outFrame);

            win.getCompatFrame(outFrame);

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

+7 −2
Original line number Original line Diff line number Diff line
@@ -1308,8 +1308,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 




        // We update mLastFrame always rather than in the conditional with the last inset

        // We update mLastFrame always rather than in the conditional with the last inset

        // variables, because mFrameSizeChanged only tracks the width and height changing.

        // variables, because mFrameSizeChanged only tracks the width and height changing.

        mWindowFrames.mLastFrame.set(mWindowFrames.mFrame);

        updateLastFrames();

        mWindowFrames.mLastRelFrame.set(mWindowFrames.mRelFrame);





        if (didFrameInsetsChange

        if (didFrameInsetsChange

                || winAnimator.mSurfaceResized

                || winAnimator.mSurfaceResized
@@ -4817,6 +4816,12 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 
        return mEmbeddedDisplayContents.remove(dc);

        return mEmbeddedDisplayContents.remove(dc);

    }

    }





    /** Updates the last frames and relative frames to the current ones. */

    void updateLastFrames() {

        mWindowFrames.mLastFrame.set(mWindowFrames.mFrame);

        mWindowFrames.mLastRelFrame.set(mWindowFrames.mRelFrame);

    }



    /**

    /**

     * Updates the last inset values to the current ones.

     * Updates the last inset values to the current ones.

     */

     */