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

Commit 2d519acd authored by Riddle Hsu's avatar Riddle Hsu Committed by Automerger Merge Worker
Browse files

Merge "Should update surface position of the window before report resize" into main am: cac166a1 

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



Change-Id: I4f9268e5210b6ec2d86669387e8893574a22296f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 135dba45 cac166a1

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

+1 −0
Original line number Diff line number Diff line
@@ -1003,6 +1003,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent> 
                // complete configuration.

                continue;

            }

            win.updateSurfacePositionIfNeeded();

            win.reportResized();

            mWmService.mResizingWindows.remove(i);

        }

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

+8 −0
Original line number Diff line number Diff line
@@ -5279,6 +5279,14 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 
        super.prepareSurfaces();

    }



    void updateSurfacePositionIfNeeded() {

        if (mWindowFrames.mRelFrame.top == mWindowFrames.mLastRelFrame.top

                && mWindowFrames.mRelFrame.left == mWindowFrames.mLastRelFrame.left) {

            return;

        }

        updateSurfacePosition(getSyncTransaction());

    }



    @Override

    @VisibleForTesting

    void updateSurfacePosition(Transaction t) {