diff options
| -rw-r--r-- | services/core/java/com/android/server/wm/WindowState.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java index b0cd074d9ad2..74e15cf08c69 100644 --- a/services/core/java/com/android/server/wm/WindowState.java +++ b/services/core/java/com/android/server/wm/WindowState.java @@ -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); } }; |