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

Commit 760a121a authored by Jerry Chang's avatar Jerry Chang Committed by Automerger Merge Worker
Browse files

Merge "Prevent setting position to a surface attached to leash" into tm-qpr-dev am: eecdde18 

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



Change-Id: If047082059fe6021a65bdefd9d2008c454c6833e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 582a5af8 eecdde18

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

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



    private final Consumer<SurfaceControl.Transaction> mSetSurfacePositionConsumer = t -> {

        if (mSurfaceControl != null && mSurfaceControl.isValid()) {

        // Only apply the position to the surface when there's no leash created.

        if (mSurfaceControl != null && mSurfaceControl.isValid() && !mSurfaceAnimator.hasLeash()) {

            t.setPosition(mSurfaceControl, mSurfacePosition.x, mSurfacePosition.y);

        }

    };