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

Commit 310588dd 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... 

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

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



Change-Id: Iaa3e2500ed75e2076c741adc0b10e9625f5a03c4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ef5d30ac 2d519acd

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

+1 −0
Original line number Diff line number Diff line
@@ -1002,6 +1002,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
@@ -5333,6 +5333,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) {